BASELINE: Update Chromium to 78.0.3904.130

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

4 files changed, 18 insertions, 20 deletions

diff --git a/chromium/net/cert_net/cert_net_fetcher_impl.cc b/chromium/net/cert_net/cert_net_fetcher_impl.cc
index 349c6562153..deabea90210 100644
--- a/chromium/net/cert_net/cert_net_fetcher_impl.cc
+++ b/chromium/net/cert_net/cert_net_fetcher_impl.cc
@@ -496,15 +496,14 @@ void Job::StartURLRequest(URLRequestContext* context) {
                                         this, traffic_annotation);
   if (request_params_->http_method == HTTP_METHOD_POST)
     url_request_->set_method("POST");
-  url_request_->SetLoadFlags(LOAD_DO_NOT_SAVE_COOKIES |
-                             LOAD_DO_NOT_SEND_COOKIES);
+  url_request_->set_allow_credentials(false);
   url_request_->Start();
 
   // Start a timer to limit how long the job runs for.
   if (request_params_->timeout > base::TimeDelta())
-    timer_.Start(
-        FROM_HERE, request_params_->timeout,
-        base::Bind(&Job::FailRequest, base::Unretained(this), ERR_TIMED_OUT));
+    timer_.Start(FROM_HERE, request_params_->timeout,
+                 base::BindOnce(&Job::FailRequest, base::Unretained(this),
+                                ERR_TIMED_OUT));
 }
 
 void Job::Cancel() {
@@ -537,8 +536,7 @@ void Job::OnResponseStarted(URLRequest* request, int net_error) {
   }
 
   if (request->GetResponseCode() != 200) {
-    // TODO(eroman): Use a more specific error code.
-    FailRequest(ERR_FAILED);
+    FailRequest(ERR_HTTP_RESPONSE_CODE_FAILURE);
     return;
   }
 
diff --git a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
index 2456bb2898e..52c33f8f8e5 100644
--- a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
+++ b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
-#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_type.h"
 #include "base/run_loop.h"
 #include "base/synchronization/lock.h"
 #include "net/cert/cert_net_fetcher.h"
@@ -18,10 +18,10 @@
 #include "net/cert/mock_cert_verifier.h"
 #include "net/cert/multi_log_ct_verifier.h"
 #include "net/dns/mock_host_resolver.h"
-#include "net/http/http_server_properties_impl.h"
+#include "net/http/http_server_properties.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/gtest_util.h"
-#include "net/test/test_with_scoped_task_environment.h"
+#include "net/test/test_with_task_environment.h"
 #include "net/test/url_request/url_request_hanging_read_job.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_filter.h"
@@ -60,7 +60,7 @@ class RequestContext : public URLRequestContext {
     storage_.set_ssl_config_service(
         std::make_unique<SSLConfigServiceDefaults>());
     storage_.set_http_server_properties(
-        std::make_unique<HttpServerPropertiesImpl>());
+        std::make_unique<HttpServerProperties>());
 
     HttpNetworkSession::Context session_context;
     session_context.host_resolver = host_resolver();
@@ -178,7 +178,7 @@ class CertNetFetcherImplTest : public PlatformTest {
   void StartNetworkThread() {
     // Start the network thread.
     network_thread_.reset(new base::Thread("network thread"));
-    base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
+    base::Thread::Options options(base::MessagePumpType::IO, 0);
     EXPECT_TRUE(network_thread_->StartWithOptions(options));
 
     // Initialize the URLRequestContext (and wait till it has completed).
@@ -232,7 +232,7 @@ class CertNetFetcherImplTest : public PlatformTest {
 // Installs URLRequestHangingReadJob handlers and clears them on teardown.
 class CertNetFetcherImplTestWithHangingReadHandler
     : public CertNetFetcherImplTest,
-      public WithScopedTaskEnvironment {
+      public WithTaskEnvironment {
  protected:
   void SetUp() override { URLRequestHangingReadJob::AddUrlHandler(); }
 
@@ -301,7 +301,7 @@ TEST_F(CertNetFetcherImplTest, HttpStatusCode) {
     GURL url = test_server_.GetURL("/404.html");
     std::unique_ptr<CertNetFetcher::Request> request =
         StartRequest(fetcher(), url);
-    VerifyFailure(ERR_FAILED, request.get());
+    VerifyFailure(ERR_HTTP_RESPONSE_CODE_FAILURE, request.get());
   }
 
   // Response was HTTP status 500.
@@ -309,7 +309,7 @@ TEST_F(CertNetFetcherImplTest, HttpStatusCode) {
     GURL url = test_server_.GetURL("/500.html");
     std::unique_ptr<CertNetFetcher::Request> request =
         StartRequest(fetcher(), url);
-    VerifyFailure(ERR_FAILED, request.get());
+    VerifyFailure(ERR_HTTP_RESPONSE_CODE_FAILURE, request.get());
   }
 }
 
diff --git a/chromium/net/cert_net/nss_ocsp.cc b/chromium/net/cert_net/nss_ocsp.cc
index 826d297fb80..5e5d4d58611 100644
--- a/chromium/net/cert_net/nss_ocsp.cc
+++ b/chromium/net/cert_net/nss_ocsp.cc
@@ -24,7 +24,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_current.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
@@ -400,8 +400,8 @@ class OCSPRequestSession
     request_ = url_request_context->CreateRequest(url_, DEFAULT_PRIORITY, this,
                                                   traffic_annotation);
     // To meet the privacy requirements of incognito mode.
-    request_->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_DO_NOT_SAVE_COOKIES |
-                           LOAD_DO_NOT_SEND_COOKIES);
+    request_->SetLoadFlags(LOAD_DISABLE_CACHE);
+    request_->set_allow_credentials(false);
 
     if (http_request_method_ == "POST") {
       DCHECK(!upload_content_.empty());
diff --git a/chromium/net/cert_net/nss_ocsp_unittest.cc b/chromium/net/cert_net/nss_ocsp_unittest.cc
index 79984fff9ae..fec8a1738ba 100644
--- a/chromium/net/cert_net/nss_ocsp_unittest.cc
+++ b/chromium/net/cert_net/nss_ocsp_unittest.cc
@@ -26,7 +26,7 @@
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"
-#include "net/test/test_with_scoped_task_environment.h"
+#include "net/test/test_with_task_environment.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_test_job.h"
@@ -77,7 +77,7 @@ class AiaResponseHandler : public URLRequestInterceptor {
 
 }  // namespace
 
-class NssHttpTest : public TestWithScopedTaskEnvironment {
+class NssHttpTest : public TestWithTaskEnvironment {
  public:
   NssHttpTest()
       : context_(false),