BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 8 insertions, 7 deletions

diff --git a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.cc b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.cc
index cc83de9991e..f2b77c24b56 100644
--- a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.cc
+++ b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.cc
@@ -30,6 +30,7 @@
 #include "third_party/blink/renderer/core/dom/exception_code.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/frame/use_counter.h"
+#include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
 
 namespace blink {
 
@@ -42,7 +43,7 @@ static void InitCustomSchemeHandlerWhitelist() {
       "mms",     "news", "nntp", "openpgp4fpr", "sip",  "sms",    "smsto",
       "ssh",     "tel",  "urn",  "webcal",      "wtai", "xmpp",
   };
-  for (size_t i = 0; i < WTF_ARRAY_LENGTH(kSchemes); ++i)
+  for (size_t i = 0; i < arraysize(kSchemes); ++i)
     g_scheme_whitelist->insert(kSchemes[i]);
 }
 
@@ -63,7 +64,7 @@ static bool VerifyCustomHandlerURL(const Document& document,
   // It is also a SyntaxError if the custom handler URL, as created by removing
   // the "%s" token and prepending the base url, does not resolve.
   String new_url = url;
-  new_url.Remove(index, WTF_ARRAY_LENGTH(kToken) - 1);
+  new_url.Remove(index, arraysize(kToken) - 1);
   KURL kurl = document.CompleteURL(new_url);
 
   if (kurl.IsEmpty() || !kurl.IsValid()) {
diff --git a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.h b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.h
index d4a4ea615ec..50075545da6 100644
--- a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.h
+++ b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/navigator_content_utils.h
@@ -62,7 +62,7 @@ class MODULES_EXPORT NavigatorContentUtils final
 
   static void ProvideTo(Navigator&, NavigatorContentUtilsClient*);
 
-  virtual void Trace(blink::Visitor*);
+  void Trace(blink::Visitor*) override;
 
   void SetClientForTest(NavigatorContentUtilsClient* client) {
     client_ = client;
diff --git a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/testing/navigator_content_utils_client_mock.h b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/testing/navigator_content_utils_client_mock.h
index cd84619aa95..534eaab73ce 100644
--- a/chromium/third_party/blink/renderer/modules/navigatorcontentutils/testing/navigator_content_utils_client_mock.h
+++ b/chromium/third_party/blink/renderer/modules/navigatorcontentutils/testing/navigator_content_utils_client_mock.h
@@ -23,11 +23,11 @@ class NavigatorContentUtilsClientMock final
 
   ~NavigatorContentUtilsClientMock() override = default;
 
-  virtual void RegisterProtocolHandler(const String& scheme,
-                                       const KURL&,
-                                       const String& title);
+  void RegisterProtocolHandler(const String& scheme,
+                               const KURL&,
+                               const String& title) override;
 
-  virtual void UnregisterProtocolHandler(const String& scheme, const KURL&);
+  void UnregisterProtocolHandler(const String& scheme, const KURL&) override;
 
  private:
   // TODO(sashab): Make NavigatorContentUtilsClientMock non-virtual and test it