BASELINE: Update Chromium to 85.0.4183.14085-based

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

4 files changed, 13 insertions, 8 deletions

diff --git a/chromium/components/net_log/chrome_net_log.cc b/chromium/components/net_log/chrome_net_log.cc
index ee4890ab074..5a902747059 100644
--- a/chromium/components/net_log/chrome_net_log.cc
+++ b/chromium/components/net_log/chrome_net_log.cc
@@ -13,17 +13,15 @@
 
 namespace net_log {
 
-std::unique_ptr<base::Value> GetConstantsForNetLog(
+base::Value GetConstantsForNetLog(
     const base::CommandLine::StringType& command_line_string,
     const std::string& channel_string) {
-  std::unique_ptr<base::DictionaryValue> constants_dict =
-      net::GetNetConstants();
-  DCHECK(constants_dict);
+  base::Value constants_dict = net::GetNetConstants();
 
   auto platform_dict =
       GetPlatformConstantsForNetLog(command_line_string, channel_string);
   if (platform_dict)
-    constants_dict->MergeDictionary(platform_dict.get());
+    constants_dict.MergeDictionary(platform_dict.get());
   return constants_dict;
 }
 
diff --git a/chromium/components/net_log/chrome_net_log.h b/chromium/components/net_log/chrome_net_log.h
index 8c1052ce237..5b5a93eea5a 100644
--- a/chromium/components/net_log/chrome_net_log.h
+++ b/chromium/components/net_log/chrome_net_log.h
@@ -24,7 +24,7 @@ namespace net_log {
 // names of error codes.
 //
 // Safe to call on any thread.
-std::unique_ptr<base::Value> GetConstantsForNetLog(
+base::Value GetConstantsForNetLog(
     const base::CommandLine::StringType& command_line_string,
     const std::string& channel_string);
 
diff --git a/chromium/components/net_log/net_export_file_writer_unittest.cc b/chromium/components/net_log/net_export_file_writer_unittest.cc
index 24284ef66c4..dc81a9d1a6d 100644
--- a/chromium/components/net_log/net_export_file_writer_unittest.cc
+++ b/chromium/components/net_log/net_export_file_writer_unittest.cc
@@ -36,6 +36,7 @@
 #include "services/network/network_service.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/simple_url_loader.h"
+#include "services/network/test/fake_test_cert_verifier_params_factory.h"
 #include "services/network/test/test_network_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -294,6 +295,10 @@ class NetExportFileWriterTest : public ::testing::Test {
     ASSERT_TRUE(log_temp_dir_.CreateUniqueTempDir());
     network::mojom::NetworkContextParamsPtr params =
         network::mojom::NetworkContextParams::New();
+    // Use a dummy CertVerifier that always passes cert verification, since
+    // these unittests don't need to test CertVerifier behavior.
+    params->cert_verifier_params =
+        network::FakeTestCertVerifierParamsFactory::GetCertVerifierParams();
     // Use a fixed proxy config, to avoid dependencies on local network
     // configuration.
     params->initial_proxy_config =
diff --git a/chromium/components/net_log/resources/net_export.html b/chromium/components/net_log/resources/net_export.html
index 14aabfc99f1..d76294355f5 100644
--- a/chromium/components/net_log/resources/net_export.html
+++ b/chromium/components/net_log/resources/net_export.html
@@ -43,7 +43,9 @@
 
       <div class="section-container">
         Click the button to start logging future network activity to a file on
-        disk.
+        disk. 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.
         <a href="https://dev.chromium.org/for-testers/providing-network-details"
            target="_blank">
         See the Chromium website for more detailed instructions.</a>
@@ -170,7 +172,7 @@
 
       <div class="section-container">
         The log file can be loaded using the
-        <a href="https://chromium.googlesource.com/catapult/+/master/netlog_viewer/"
+        <a href="https://netlog-viewer.appspot.com/"
            target="_blank">netlog_viewer</a>.
       </div>