commit 76ffcca033822e8cce853a3039c72437ad542974
author Devany Sandoval <sandovad@google.com> Wed Nov 16 13:14:11 2016 -0800
committer sandovad <sandovad@google.com> Tue Sep 03 12:54:06 2019 -0700
tree 48bcc9fdb31de7c78ebc61793bc7dbc76e35c933
parent d5a45e88eebcd268d8f9e8ace7e2ced581c1fe5a

Internal change

PiperOrigin-RevId: 139369394
Change-Id: I4f262e79fa08880b06cfb87df0919f657e4b22a7

import.sh

diff --git a/import.sh b/import.sh
index dd789ed..6e9f053 100644
--- a/import.sh
+++ b/import.sh
@@ -4,7 +4,7 @@
 top=/tmp/chromium
 mkdir $top
 prefix=https://chromium.googlesource.com/chromium/src.git/+archive
-for version in 52.0.2743.82 53.0.2785.116
+for version in 53.0.2785.116 54.0.2840.100
 do
   mkdir $top/$version
   cd $top/$version

src/base/strings/utf_string_conversion_utils.h

diff --git a/src/base/strings/utf_string_conversion_utils.h b/src/base/strings/utf_string_conversion_utils.h
index 294670e..e85d9ce 100644
--- a/src/base/strings/utf_string_conversion_utils.h
+++ b/src/base/strings/utf_string_conversion_utils.h
@@ -5,7 +5,8 @@
 #ifndef BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 #define BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 
-// This should only be used by the various UTF string conversion files.
+// Low-level UTF handling functions. Most code will want to use the functions
+// in utf_string_conversions.h
 
 #include <stddef.h>
 #include <stdint.h>

src/build/build_config.h

diff --git a/src/build/build_config.h b/src/build/build_config.h
index c6479b2..f67dd48 100644
--- a/src/build/build_config.h
+++ b/src/build/build_config.h
@@ -51,6 +51,8 @@
 #define TOOLKIT_VIEWS 1
 #elif defined(__FreeBSD__)
 #define OS_FREEBSD 1
+#elif defined(__NetBSD__)
+#define OS_NETBSD 1
 #elif defined(__OpenBSD__)
 #define OS_OPENBSD 1
 #elif defined(__sun)
@@ -67,15 +69,16 @@
 
 // For access to standard BSD features, use OS_BSD instead of a
 // more specific macro.
-#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
+#if defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
 #define OS_BSD 1
 #endif
 
 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) ||     \
-    defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) ||  \
-    defined(OS_NACL) || defined(OS_QNX)
+    defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS) ||   \
+    defined(OS_ANDROID) || defined(OS_OPENBSD) || defined(OS_SOLARIS) ||  \
+    defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_QNX)
 #define OS_POSIX 1
 #endif
 

src/url/origin_unittest.cc

diff --git a/src/url/origin_unittest.cc b/src/url/origin_unittest.cc
index 68371a8..d1ba161 100644
--- a/src/url/origin_unittest.cc
+++ b/src/url/origin_unittest.cc
@@ -27,7 +27,7 @@
                               "yay",
                               "http::///invalid.example.com/"};
 
-  for (const auto& test_url : urls) {
+  for (auto* test_url : urls) {
     SCOPED_TRACE(test_url);
     GURL url(test_url);
     url::Origin origin(url);

src/url/scheme_host_port_unittest.cc

diff --git a/src/url/scheme_host_port_unittest.cc b/src/url/scheme_host_port_unittest.cc
index 790a5f1..46e1cf8 100644
--- a/src/url/scheme_host_port_unittest.cc
+++ b/src/url/scheme_host_port_unittest.cc
@@ -26,7 +26,7 @@
                         "blob:https://example.com/uuid-goes-here",
                         "filesystem:https://example.com/temporary/yay.png"};
 
-  for (const auto& test : urls) {
+  for (auto* test : urls) {
     SCOPED_TRACE(test);
     GURL url(test);
     url::SchemeHostPort tuple(url);