BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

9 files changed, 47 insertions, 27 deletions

diff --git a/chromium/components/domain_reliability/DEPS b/chromium/components/domain_reliability/DEPS
index 5516f8d5451..5190a4bce94 100644
--- a/chromium/components/domain_reliability/DEPS
+++ b/chromium/components/domain_reliability/DEPS
@@ -8,6 +8,6 @@ include_rules = [
   "+content/public/browser",
   "+content/public/common",
   "+content/public/test",
-  "+third_party/WebKit/public",
+  "+third_party/blink/public",
 ]
 
diff --git a/chromium/components/domain_reliability/OWNERS b/chromium/components/domain_reliability/OWNERS
index c6f3da30e81..22db3afd6f2 100644
--- a/chromium/components/domain_reliability/OWNERS
+++ b/chromium/components/domain_reliability/OWNERS
@@ -1,5 +1,4 @@
 davidben@chromium.org
-rdsmith@chromium.org
 juliatuttle@chromium.org
 
 per-file quic_error_mapping*=rch@chromium.org
diff --git a/chromium/components/domain_reliability/google_configs.cc b/chromium/components/domain_reliability/google_configs.cc
index 5dd88eec0c2..31ad3f170c8 100644
--- a/chromium/components/domain_reliability/google_configs.cc
+++ b/chromium/components/domain_reliability/google_configs.cc
@@ -351,6 +351,7 @@ const GoogleConfigParams kGoogleConfigs[] = {
     {"googletagmanager.com", true, false, false},
     {"googletagservices.com", true, false, false},
     {"googleusercontent.com", true, false, false},
+    {"googlezip.net", true, false, false},
     {"gstatic.cn", true, false, false},
     {"gstatic.com", true, false, false},
     {"gvt3.com", true, false, false},
diff --git a/chromium/components/domain_reliability/service.cc b/chromium/components/domain_reliability/service.cc
index c1bce2654d3..ed369b869d6 100644
--- a/chromium/components/domain_reliability/service.cc
+++ b/chromium/components/domain_reliability/service.cc
@@ -19,7 +19,7 @@
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
+#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
 #include "url/gurl.h"
 
 namespace domain_reliability {
diff --git a/chromium/components/domain_reliability/service_unittest.cc b/chromium/components/domain_reliability/service_unittest.cc
index 2491253c754..301b8df1b0e 100644
--- a/chromium/components/domain_reliability/service_unittest.cc
+++ b/chromium/components/domain_reliability/service_unittest.cc
@@ -11,13 +11,17 @@
 #include "base/time/time.h"
 #include "components/domain_reliability/monitor.h"
 #include "components/domain_reliability/test_util.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_manager.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_context.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
 #include "net/base/host_port_pair.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
+#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
 
 namespace domain_reliability {
 
@@ -55,6 +59,17 @@ class TestPermissionManager : public content::PermissionManager {
     return permission_status_;
   }
 
+  blink::mojom::PermissionStatus GetPermissionStatusForFrame(
+      content::PermissionType permission,
+      content::RenderFrameHost* render_frame_host,
+      const GURL& requesting_origin) override {
+    return GetPermissionStatus(
+        permission, requesting_origin,
+        content::WebContents::FromRenderFrameHost(render_frame_host)
+            ->GetLastCommittedURL()
+            .GetOrigin());
+  }
+
   int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
@@ -122,16 +137,20 @@ class DomainReliabilityServiceTest : public testing::Test {
 
   DomainReliabilityServiceTest()
       : upload_reporter_string_("test"),
-        permission_manager_(new TestPermissionManager()),
-        ui_task_runner_(new base::TestSimpleTaskRunner()),
-        network_task_runner_(new base::TestSimpleTaskRunner()),
-        url_request_context_getter_(
-            new net::TestURLRequestContextGetter(network_task_runner_)) {
+        permission_manager_(new TestPermissionManager()) {
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
+        content::BrowserThread::GetTaskRunnerForThread(
+            content::BrowserThread::UI);
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner =
+        content::BrowserThread::GetTaskRunnerForThread(
+            content::BrowserThread::IO);
+    url_request_context_getter_ =
+        new net::TestURLRequestContextGetter(network_task_runner);
     browser_context_.SetPermissionManager(
         base::WrapUnique(permission_manager_));
     service_ = base::WrapUnique(DomainReliabilityService::Create(
         upload_reporter_string_, &browser_context_));
-    monitor_ = service_->CreateMonitor(ui_task_runner_, network_task_runner_);
+    monitor_ = service_->CreateMonitor(ui_task_runner, network_task_runner);
     monitor_->MoveToNetworkThread();
     monitor_->InitURLRequestContext(url_request_context_getter_);
     monitor_->SetDiscardUploads(true);
@@ -150,7 +169,7 @@ class DomainReliabilityServiceTest : public testing::Test {
     return monitor_->uploader_->GetDiscardedUploadCount();
   }
 
-  base::MessageLoopForIO message_loop_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   std::string upload_reporter_string_;
 
@@ -161,9 +180,6 @@ class DomainReliabilityServiceTest : public testing::Test {
 
   std::unique_ptr<DomainReliabilityService> service_;
 
-  scoped_refptr<base::TestSimpleTaskRunner> ui_task_runner_;
-  scoped_refptr<base::TestSimpleTaskRunner> network_task_runner_;
-
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
   std::unique_ptr<DomainReliabilityMonitor> monitor_;
@@ -200,10 +216,10 @@ TEST_F(DomainReliabilityServiceTest, UploadAllowed) {
 
   monitor_->ForceUploadsForTesting();
 
-  ui_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
   EXPECT_EQ(1, permission_manager_->get_permission_status_count());
 
-  network_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   EXPECT_EQ(1, GetDiscardedUploadCount());
 }
 
@@ -231,10 +247,10 @@ TEST_F(DomainReliabilityServiceTest, UploadForbidden) {
 
   monitor_->ForceUploadsForTesting();
 
-  ui_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
   EXPECT_EQ(1, permission_manager_->get_permission_status_count());
 
-  network_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   EXPECT_EQ(0, GetDiscardedUploadCount());
 }
 
@@ -265,10 +281,10 @@ TEST_F(DomainReliabilityServiceTest, MonitorDestroyedBeforeCheckRuns) {
   monitor_->Shutdown();
   monitor_.reset();
 
-  ui_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
   EXPECT_EQ(1, permission_manager_->get_permission_status_count());
 
-  network_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   // Makes no sense to check upload count, since monitor was destroyed.
 }
 
@@ -296,13 +312,13 @@ TEST_F(DomainReliabilityServiceTest, MonitorDestroyedBeforeCheckReturns) {
 
   monitor_->ForceUploadsForTesting();
 
-  ui_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
   EXPECT_EQ(1, permission_manager_->get_permission_status_count());
 
   monitor_->Shutdown();
   monitor_.reset();
 
-  network_task_runner_->RunPendingTasks();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   // Makes no sense to check upload count, since monitor was destroyed.
 }
 
diff --git a/chromium/components/domain_reliability/test_util.cc b/chromium/components/domain_reliability/test_util.cc
index 7793784fbb1..e34d1bd59cb 100644
--- a/chromium/components/domain_reliability/test_util.cc
+++ b/chromium/components/domain_reliability/test_util.cc
@@ -122,7 +122,9 @@ MockTime::MockTime()
 MockTime::~MockTime() {}
 
 base::Time MockTime::Now() { return now_; }
-base::TimeTicks MockTime::NowTicks() { return now_ticks_; }
+base::TimeTicks MockTime::NowTicks() const {
+  return now_ticks_;
+}
 
 std::unique_ptr<MockableTime::Timer> MockTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new MockTimer(this));
diff --git a/chromium/components/domain_reliability/test_util.h b/chromium/components/domain_reliability/test_util.h
index 0211ae0e9f5..30d32d08d8d 100644
--- a/chromium/components/domain_reliability/test_util.h
+++ b/chromium/components/domain_reliability/test_util.h
@@ -76,7 +76,7 @@ class MockTime : public MockableTime {
 
   // MockableTime implementation:
   base::Time Now() override;
-  base::TimeTicks NowTicks() override;
+  base::TimeTicks NowTicks() const override;
   std::unique_ptr<MockableTime::Timer> CreateTimer() override;
 
   // Pretends that |delta| has passed, and runs tasks that would've happened
diff --git a/chromium/components/domain_reliability/util.cc b/chromium/components/domain_reliability/util.cc
index 4fb78944502..5895c7653b2 100644
--- a/chromium/components/domain_reliability/util.cc
+++ b/chromium/components/domain_reliability/util.cc
@@ -242,7 +242,9 @@ ActualTime::ActualTime() {}
 ActualTime::~ActualTime() {}
 
 base::Time ActualTime::Now() { return base::Time::Now(); }
-base::TimeTicks ActualTime::NowTicks() { return base::TimeTicks::Now(); }
+base::TimeTicks ActualTime::NowTicks() const {
+  return base::TimeTicks::Now();
+}
 
 std::unique_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new ActualTimer());
diff --git a/chromium/components/domain_reliability/util.h b/chromium/components/domain_reliability/util.h
index b6daa1d83c7..0b95d2329e6 100644
--- a/chromium/components/domain_reliability/util.h
+++ b/chromium/components/domain_reliability/util.h
@@ -84,7 +84,7 @@ class DOMAIN_RELIABILITY_EXPORT MockableTime : public base::Clock,
   // Clock impl; returns base::Time::Now() or a mocked version thereof.
   base::Time Now() override = 0;
   // TickClock impl; returns base::TimeTicks::Now() or a mocked version thereof.
-  base::TimeTicks NowTicks() override = 0;
+  base::TimeTicks NowTicks() const override = 0;
 
   // Returns a new Timer, or a mocked version thereof.
   virtual std::unique_ptr<MockableTime::Timer> CreateTimer() = 0;
@@ -106,7 +106,7 @@ class DOMAIN_RELIABILITY_EXPORT ActualTime : public MockableTime {
 
   // MockableTime implementation:
   base::Time Now() override;
-  base::TimeTicks NowTicks() override;
+  base::TimeTicks NowTicks() const override;
   std::unique_ptr<MockableTime::Timer> CreateTimer() override;
 };