BASELINE: Update Chromium to 88.0.4324.208

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

6 files changed, 29 insertions, 31 deletions

diff --git a/chromium/components/net_log/chrome_net_log.cc b/chromium/components/net_log/chrome_net_log.cc
index 5a902747059..b0cdd069149 100644
--- a/chromium/components/net_log/chrome_net_log.cc
+++ b/chromium/components/net_log/chrome_net_log.cc
@@ -4,27 +4,16 @@
 
 #include "components/net_log/chrome_net_log.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/system/sys_info.h"
 #include "base/values.h"
 #include "components/version_info/version_info.h"
-#include "net/log/net_log_util.h"
 
 namespace net_log {
 
-base::Value GetConstantsForNetLog(
-    const base::CommandLine::StringType& command_line_string,
-    const std::string& channel_string) {
-  base::Value constants_dict = net::GetNetConstants();
-
-  auto platform_dict =
-      GetPlatformConstantsForNetLog(command_line_string, channel_string);
-  if (platform_dict)
-    constants_dict.MergeDictionary(platform_dict.get());
-  return constants_dict;
-}
-
 std::unique_ptr<base::DictionaryValue> GetPlatformConstantsForNetLog(
     const base::CommandLine::StringType& command_line_string,
     const std::string& channel_string) {
diff --git a/chromium/components/net_log/chrome_net_log.h b/chromium/components/net_log/chrome_net_log.h
index 5b5a93eea5a..cb5a56eb89b 100644
--- a/chromium/components/net_log/chrome_net_log.h
+++ b/chromium/components/net_log/chrome_net_log.h
@@ -13,23 +13,11 @@
 
 namespace base {
 class DictionaryValue;
-class Value;
 }
 
 namespace net_log {
 
-// Returns all the constants to include in NetLog files. This includes both
-// platform-specific details (GetPlatformConstantsForNetLog()) as well as the
-// basic src/net constants (net::GetNetConstants()) for things like symbolic
-// names of error codes.
-//
-// Safe to call on any thread.
-base::Value GetConstantsForNetLog(
-    const base::CommandLine::StringType& command_line_string,
-    const std::string& channel_string);
-
-// Returns constants to include in NetLog files for debugging purposes, which
-// includes information such as:
+// Returns constants to include in NetLog files including information such as:
 //
 //  * The version and build of Chrome
 //  * The command line arguments Chrome was launched with
diff --git a/chromium/components/net_log/net_export_file_writer.cc b/chromium/components/net_log/net_export_file_writer.cc
index 72e588ae750..f430b2e9450 100644
--- a/chromium/components/net_log/net_export_file_writer.cc
+++ b/chromium/components/net_log/net_export_file_writer.cc
@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/callback.h"
+#include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
diff --git a/chromium/components/net_log/net_log_proxy_source_unittest.cc b/chromium/components/net_log/net_log_proxy_source_unittest.cc
index 9e51088b74e..9ce7a1a8d24 100644
--- a/chromium/components/net_log/net_log_proxy_source_unittest.cc
+++ b/chromium/components/net_log/net_log_proxy_source_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/run_loop.h"
 #include "base/synchronization/lock.h"
-#include "base/test/bind_test_util.h"
+#include "base/test/bind.h"
 #include "base/test/task_environment.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_with_source.h"
diff --git a/chromium/components/net_log/resources/net_export.html b/chromium/components/net_log/resources/net_export.html
index d76294355f5..3f10870a7cd 100644
--- a/chromium/components/net_log/resources/net_export.html
+++ b/chromium/components/net_log/resources/net_export.html
@@ -11,11 +11,13 @@
 <script src="chrome://resources/js/ios/web_ui.js"></script>
 </if>
 
+<script src="chrome://resources/js/assert.js"></script>
 <script src="chrome://resources/js/util.js"></script>
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://net-export/net_export.js"></script>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 <link rel="stylesheet" href="net_export.css">
+<link rel="icon" id="fav-icon">
 <title>Network Log Export</title>
 </head>
 <body>
@@ -43,9 +45,17 @@
 
       <div class="section-container">
         Click the button to start logging future network activity to a file on
-        disk. The log includes details of network activity from all of Chrome,
+        disk.
+        <if expr="not(is_ios)">
+        The log includes details of network activity from all of Chrome,
         including incognito and non-incognito tabs, visited URLs, and
         information about the network configuration.
+        </if>
+        <if expr="is_ios">
+        The log includes details of network activity handled by Chrome's
+        internal network stack. Note, this does not include network requests
+        for ordinary web content, which are instead handled by WKWebView.
+        </if>
         <a href="https://dev.chromium.org/for-testers/providing-network-details"
            target="_blank">
         See the Chromium website for more detailed instructions.</a>
@@ -180,7 +190,7 @@
         <b><span class="warning">PRIVACY</span></b>: Be aware when
         sharing your network logs that they may contain private information. At
         a minimum, they list the URLs and hostnames of sites visited while
-        logging was enabled. 
+        logging was enabled.
         <a href="#" id="privacy-read-more-link">Read more...</a>
 
         <div id="privacy-read-more">
diff --git a/chromium/components/net_log/resources/net_export.js b/chromium/components/net_log/resources/net_export.js
index 5d4ca989e90..520fce30207 100644
--- a/chromium/components/net_log/resources/net_export.js
+++ b/chromium/components/net_log/resources/net_export.js
@@ -210,7 +210,10 @@ const NetExportView = (function() {
      */
     renderLogging_(info) {
       this.showStateDiv_(kIdStateDivLogging);
-
+      this.setFavicon_(
+          'data:image/svg+xml,<svg version="1.1" ' +
+          'xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">' +
+          '<circle cx="16" cy="16" r="14" fill="red" stroke="black" /></svg>');
       $(kIdStopLoggingButton).onclick = this.onStopLogging_.bind(this);
       $(kIdCaptureModeLogging).textContent = this.getCaptureModeText_(info);
       $(kIdFilePathLogging).textContent = info.file;
@@ -220,6 +223,7 @@ const NetExportView = (function() {
      * Updates the UI to display the state when logging has stopped.
      */
     renderStoppedLogging_(info) {
+      this.setFavicon_('data:image/x-icon;base64,');
       this.showStateDiv_(kIdStateDivStopped);
 
       // The email button is only available in the mobile UI.
@@ -287,6 +291,13 @@ const NetExportView = (function() {
         $(curDivId).hidden = divId !== curDivId;
       }
     },
+
+    /**
+     * Sets the icon for the tab to reflect current capturing state.
+     */
+    setFavicon_(dataUrl) {
+      document.getElementById('fav-icon').href = dataUrl;
+    }
   };
 
   return NetExportView;