BASELINE: Update Chromium to 91.0.4472.160

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

7 files changed, 46 insertions, 15 deletions

diff --git a/chromium/components/domain_reliability/context_unittest.cc b/chromium/components/domain_reliability/context_unittest.cc
index 7a9bd45aeeb..185ad8925e8 100644
--- a/chromium/components/domain_reliability/context_unittest.cc
+++ b/chromium/components/domain_reliability/context_unittest.cc
@@ -138,9 +138,9 @@ class DomainReliabilityContextTest : public testing::Test {
   }
 
   void InitContext(std::unique_ptr<const DomainReliabilityConfig> config) {
-    context_.reset(new DomainReliabilityContext(
+    context_ = std::make_unique<DomainReliabilityContext>(
         &time_, params_, upload_reporter_string_, &last_network_change_time_,
-        upload_allowed_callback_, &dispatcher_, &uploader_, std::move(config)));
+        upload_allowed_callback_, &dispatcher_, &uploader_, std::move(config));
   }
 
   void ShutDownContext() { context_.reset(); }
diff --git a/chromium/components/domain_reliability/scheduler.cc b/chromium/components/domain_reliability/scheduler.cc
index 2f940af3c88..97b61cc9209 100644
--- a/chromium/components/domain_reliability/scheduler.cc
+++ b/chromium/components/domain_reliability/scheduler.cc
@@ -95,8 +95,8 @@ DomainReliabilityScheduler::DomainReliabilityScheduler(
   backoff_policy_.always_use_initial_delay = false;
 
   for (size_t i = 0; i < num_collectors; ++i) {
-    collectors_.push_back(
-        std::make_unique<net::BackoffEntry>(&backoff_policy_, time_));
+    collectors_.push_back(std::make_unique<net::BackoffEntry>(
+        &backoff_policy_, time->AsTickClock()));
   }
 }
 
diff --git a/chromium/components/domain_reliability/scheduler_unittest.cc b/chromium/components/domain_reliability/scheduler_unittest.cc
index 45a10a5996d..85738cd90d4 100644
--- a/chromium/components/domain_reliability/scheduler_unittest.cc
+++ b/chromium/components/domain_reliability/scheduler_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/config.h"
@@ -32,11 +34,11 @@ class DomainReliabilitySchedulerTest : public testing::Test {
     DCHECK(!scheduler_);
 
     num_collectors_ = num_collectors;
-    scheduler_.reset(new DomainReliabilityScheduler(
+    scheduler_ = std::make_unique<DomainReliabilityScheduler>(
         &time_, num_collectors_, params_,
         base::BindRepeating(
             &DomainReliabilitySchedulerTest::ScheduleUploadCallback,
-            base::Unretained(this))));
+            base::Unretained(this)));
     scheduler_->MakeDeterministicForTesting();
   }
 
diff --git a/chromium/components/domain_reliability/test_util.cc b/chromium/components/domain_reliability/test_util.cc
index 6926d8a9baa..f87c54a41c6 100644
--- a/chromium/components/domain_reliability/test_util.cc
+++ b/chromium/components/domain_reliability/test_util.cc
@@ -110,11 +110,16 @@ int MockUploader::GetDiscardedUploadCount() const {
   return 0;
 }
 
+base::TimeTicks MockTickClock::NowTicks() const {
+  return mock_time_->NowTicks();
+}
+
 MockTime::MockTime()
     : now_(base::Time::Now()),
       now_ticks_(base::TimeTicks::Now()),
       epoch_ticks_(now_ticks_),
-      task_sequence_number_(0) {
+      task_sequence_number_(0),
+      tick_clock_(this) {
   VLOG(1) << "Creating mock time: T=" << elapsed_sec() << "s";
 }
 
@@ -131,6 +136,10 @@ std::unique_ptr<MockableTime::Timer> MockTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new MockTimer(this));
 }
 
+const base::TickClock* MockTime::AsTickClock() const {
+  return &tick_clock_;
+}
+
 void MockTime::Advance(base::TimeDelta delta) {
   base::TimeTicks target_ticks = now_ticks_ + delta;
 
diff --git a/chromium/components/domain_reliability/test_util.h b/chromium/components/domain_reliability/test_util.h
index 211f96cb64d..eda7b60dced 100644
--- a/chromium/components/domain_reliability/test_util.h
+++ b/chromium/components/domain_reliability/test_util.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/callback_forward.h"
+#include "base/time/tick_clock.h"
 #include "components/domain_reliability/config.h"
 #include "components/domain_reliability/scheduler.h"
 #include "components/domain_reliability/uploader.h"
@@ -70,6 +71,19 @@ class MockUploader : public DomainReliabilityUploader {
   bool discard_uploads_;
 };
 
+class MockTime;
+
+class MockTickClock : public base::TickClock {
+ public:
+  explicit MockTickClock(MockTime* mock_time) : mock_time_(mock_time) {}
+  ~MockTickClock() override = default;
+  // base::TickClock implementation
+  base::TimeTicks NowTicks() const override;
+
+ private:
+  MockTime* mock_time_;
+};
+
 class MockTime : public MockableTime {
  public:
   MockTime();
@@ -83,6 +97,7 @@ class MockTime : public MockableTime {
   base::Time Now() const override;
   base::TimeTicks NowTicks() const override;
   std::unique_ptr<MockableTime::Timer> CreateTimer() override;
+  const base::TickClock* AsTickClock() const override;
 
   // Pretends that |delta| has passed, and runs tasks that would've happened
   // during that interval (with |Now()| returning proper values while they
@@ -125,6 +140,7 @@ class MockTime : public MockableTime {
   base::TimeTicks epoch_ticks_;
   int task_sequence_number_;
   TaskMap tasks_;
+  MockTickClock tick_clock_;
 };
 
 std::unique_ptr<DomainReliabilityConfig> MakeTestConfig();
diff --git a/chromium/components/domain_reliability/util.cc b/chromium/components/domain_reliability/util.cc
index e9f8925aa50..d0973ea98b4 100644
--- a/chromium/components/domain_reliability/util.cc
+++ b/chromium/components/domain_reliability/util.cc
@@ -10,6 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/notreached.h"
 #include "base/stl_util.h"
+#include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/base/net_errors.h"
@@ -212,4 +213,8 @@ std::unique_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new ActualTimer());
 }
 
+const base::TickClock* ActualTime::AsTickClock() const {
+  return base::DefaultTickClock::GetInstance();
+}
+
 }  // namespace domain_reliability
diff --git a/chromium/components/domain_reliability/util.h b/chromium/components/domain_reliability/util.h
index 802d7d6caad..91c4eb559d7 100644
--- a/chromium/components/domain_reliability/util.h
+++ b/chromium/components/domain_reliability/util.h
@@ -12,7 +12,6 @@
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/time/clock.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/domain_reliability_export.h"
@@ -55,8 +54,7 @@ GURL SanitizeURLForReport(
 // Mockable wrapper around TimeTicks::Now and Timer. Mock version is in
 // test_util.h.
 // TODO(juliatuttle): Rename to Time{Provider,Source,?}.
-class DOMAIN_RELIABILITY_EXPORT MockableTime : public base::Clock,
-                                               public base::TickClock {
+class DOMAIN_RELIABILITY_EXPORT MockableTime {
  public:
   // Mockable wrapper around (a subset of) base::Timer.
   class DOMAIN_RELIABILITY_EXPORT Timer {
@@ -73,16 +71,16 @@ class DOMAIN_RELIABILITY_EXPORT MockableTime : public base::Clock,
     Timer();
   };
 
-  ~MockableTime() override;
+  virtual ~MockableTime();
 
-  // Clock impl; returns base::Time::Now() or a mocked version thereof.
-  base::Time Now() const override = 0;
-  // TickClock impl; returns base::TimeTicks::Now() or a mocked version thereof.
-  base::TimeTicks NowTicks() const override = 0;
+  virtual base::Time Now() const = 0;
+  virtual base::TimeTicks NowTicks() const = 0;
 
   // Returns a new Timer, or a mocked version thereof.
   virtual std::unique_ptr<MockableTime::Timer> CreateTimer() = 0;
 
+  virtual const base::TickClock* AsTickClock() const = 0;
+
  protected:
   MockableTime();
 
@@ -102,6 +100,7 @@ class DOMAIN_RELIABILITY_EXPORT ActualTime : public MockableTime {
   base::Time Now() const override;
   base::TimeTicks NowTicks() const override;
   std::unique_ptr<MockableTime::Timer> CreateTimer() override;
+  const base::TickClock* AsTickClock() const override;
 };
 
 }  // namespace domain_reliability