BASELINE: Update Chromium to 68.0.3440.125

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

7 files changed, 19 insertions, 28 deletions

diff --git a/chromium/third_party/webrtc/common_video/BUILD.gn b/chromium/third_party/webrtc/common_video/BUILD.gn
index bd4c5f75034..0e3f2da4716 100644
--- a/chromium/third_party/webrtc/common_video/BUILD.gn
+++ b/chromium/third_party/webrtc/common_video/BUILD.gn
@@ -58,15 +58,14 @@ rtc_static_library("common_video") {
     "..:webrtc_common",
     "../:typedefs",
     "../api:optional",
-    "../api:video_frame_api",
-    "../api:video_frame_api_i420",
+    "../api/video:video_frame",
+    "../api/video:video_frame_i420",
     "../media:rtc_h264_profile_id",
     "../modules:module_api",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
-    "../system_wrappers",
     "//third_party/libyuv",
   ]
 }
@@ -109,12 +108,12 @@ if (rtc_include_tests) {
 
     deps = [
       ":common_video",
-      "../api:video_frame_api",
-      "../api:video_frame_api_i420",
+      "../api/video:video_frame",
+      "../api/video:video_frame_i420",
       "../modules/video_capture:video_capture",
       "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
-      "../system_wrappers:system_wrappers",
+      "../rtc_base:rtc_base_tests_utils",
       "../test:fileutils",
       "../test:test_main",
       "../test:video_test_common",
diff --git a/chromium/third_party/webrtc/common_video/bitrate_adjuster.cc b/chromium/third_party/webrtc/common_video/bitrate_adjuster.cc
index 0d3458c6c84..3bb06944f2e 100644
--- a/chromium/third_party/webrtc/common_video/bitrate_adjuster.cc
+++ b/chromium/third_party/webrtc/common_video/bitrate_adjuster.cc
@@ -15,7 +15,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "system_wrappers/include/clock.h"
+#include "rtc_base/timeutils.h"
 
 namespace webrtc {
 
@@ -30,11 +30,9 @@ const float BitrateAdjuster::kBitrateTolerancePct = .1f;
 
 const float BitrateAdjuster::kBytesPerMsToBitsPerSecond = 8 * 1000;
 
-BitrateAdjuster::BitrateAdjuster(Clock* clock,
-                                 float min_adjusted_bitrate_pct,
+BitrateAdjuster::BitrateAdjuster(float min_adjusted_bitrate_pct,
                                  float max_adjusted_bitrate_pct)
-    : clock_(clock),
-      min_adjusted_bitrate_pct_(min_adjusted_bitrate_pct),
+    : min_adjusted_bitrate_pct_(min_adjusted_bitrate_pct),
       max_adjusted_bitrate_pct_(max_adjusted_bitrate_pct),
       bitrate_tracker_(1.5 * kBitrateUpdateIntervalMs,
                        kBytesPerMsToBitsPerSecond) {
@@ -72,12 +70,12 @@ uint32_t BitrateAdjuster::GetAdjustedBitrateBps() const {
 
 rtc::Optional<uint32_t> BitrateAdjuster::GetEstimatedBitrateBps() {
   rtc::CritScope cs(&crit_);
-  return bitrate_tracker_.Rate(clock_->TimeInMilliseconds());
+  return bitrate_tracker_.Rate(rtc::TimeMillis());
 }
 
 void BitrateAdjuster::Update(size_t frame_size) {
   rtc::CritScope cs(&crit_);
-  uint32_t current_time_ms = clock_->TimeInMilliseconds();
+  uint32_t current_time_ms = rtc::TimeMillis();
   bitrate_tracker_.Update(frame_size, current_time_ms);
   UpdateBitrate(current_time_ms);
 }
diff --git a/chromium/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc b/chromium/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc
index b75f184cf2d..6e8d3fb856d 100644
--- a/chromium/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc
+++ b/chromium/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc
@@ -9,7 +9,7 @@
  */
 
 #include "common_video/include/bitrate_adjuster.h"
-#include "system_wrappers/include/clock.h"
+#include "rtc_base/fakeclock.h"
 #include "test/gtest.h"
 
 namespace webrtc {
@@ -17,8 +17,7 @@ namespace webrtc {
 class BitrateAdjusterTest : public ::testing::Test {
  public:
   BitrateAdjusterTest()
-      : clock_(0),
-        adjuster_(&clock_, kMinAdjustedBitratePct, kMaxAdjustedBitratePct) {}
+      : adjuster_(kMinAdjustedBitratePct, kMaxAdjustedBitratePct) {}
 
   // Simulate an output bitrate for one update cycle of BitrateAdjuster.
   void SimulateBitrateBps(uint32_t bitrate_bps) {
@@ -33,7 +32,7 @@ class BitrateAdjusterTest : public ::testing::Test {
     const size_t frame_size_bytes =
         (bitrate_bps * frame_interval_ms) / (8 * 1000);
     for (size_t i = 0; i < update_frame_interval; ++i) {
-      clock_.AdvanceTimeMilliseconds(frame_interval_ms);
+      clock_.AdvanceTime(webrtc::TimeDelta::ms(frame_interval_ms));
       adjuster_.Update(frame_size_bytes);
     }
   }
@@ -63,7 +62,7 @@ class BitrateAdjusterTest : public ::testing::Test {
  protected:
   static const float kMinAdjustedBitratePct;
   static const float kMaxAdjustedBitratePct;
-  SimulatedClock clock_;
+  rtc::ScopedFakeClock clock_;
   BitrateAdjuster adjuster_;
 };
 
diff --git a/chromium/third_party/webrtc/common_video/include/bitrate_adjuster.h b/chromium/third_party/webrtc/common_video/include/bitrate_adjuster.h
index fd83555469c..76ce9e9901f 100644
--- a/chromium/third_party/webrtc/common_video/include/bitrate_adjuster.h
+++ b/chromium/third_party/webrtc/common_video/include/bitrate_adjuster.h
@@ -18,8 +18,6 @@
 
 namespace webrtc {
 
-class Clock;
-
 // Certain hardware encoders tend to consistently overshoot the bitrate that
 // they are configured to encode at. This class estimates an adjusted bitrate
 // that when set on the encoder will produce the desired bitrate.
@@ -28,8 +26,7 @@ class BitrateAdjuster {
   // min_adjusted_bitrate_pct and max_adjusted_bitrate_pct are the lower and
   // upper bound outputted adjusted bitrates as a percentage of the target
   // bitrate.
-  BitrateAdjuster(Clock* clock,
-                  float min_adjusted_bitrate_pct,
+  BitrateAdjuster(float min_adjusted_bitrate_pct,
                   float max_adjusted_bitrate_pct);
   virtual ~BitrateAdjuster() {}
 
@@ -68,7 +65,6 @@ class BitrateAdjuster {
       RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   rtc::CriticalSection crit_;
-  Clock* const clock_;
   const float min_adjusted_bitrate_pct_;
   const float max_adjusted_bitrate_pct_;
   // The bitrate we want.
diff --git a/chromium/third_party/webrtc/common_video/include/incoming_video_stream.h b/chromium/third_party/webrtc/common_video/include/incoming_video_stream.h
index 405416c2d81..8063061d313 100644
--- a/chromium/third_party/webrtc/common_video/include/incoming_video_stream.h
+++ b/chromium/third_party/webrtc/common_video/include/incoming_video_stream.h
@@ -11,7 +11,7 @@
 #ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
 #define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
 
-#include "api/videosinkinterface.h"
+#include "api/video/video_sink_interface.h"
 #include "common_video/video_render_frames.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/task_queue.h"
diff --git a/chromium/third_party/webrtc/common_video/include/video_bitrate_allocator.h b/chromium/third_party/webrtc/common_video/include/video_bitrate_allocator.h
index 597b6259a4a..be7cd649d08 100644
--- a/chromium/third_party/webrtc/common_video/include/video_bitrate_allocator.h
+++ b/chromium/third_party/webrtc/common_video/include/video_bitrate_allocator.h
@@ -20,8 +20,8 @@ class VideoBitrateAllocator {
   VideoBitrateAllocator() {}
   virtual ~VideoBitrateAllocator() {}
 
-  virtual BitrateAllocation GetAllocation(uint32_t total_bitrate,
-                                          uint32_t framerate) = 0;
+  virtual VideoBitrateAllocation GetAllocation(uint32_t total_bitrate,
+                                               uint32_t framerate) = 0;
   virtual uint32_t GetPreferredBitrateBps(uint32_t framerate) = 0;
 };
 
@@ -31,7 +31,7 @@ class VideoBitrateAllocationObserver {
   virtual ~VideoBitrateAllocationObserver() {}
 
   virtual void OnBitrateAllocationUpdated(
-      const BitrateAllocation& allocation) = 0;
+      const VideoBitrateAllocation& allocation) = 0;
 };
 
 }  // namespace webrtc
diff --git a/chromium/third_party/webrtc/common_video/incoming_video_stream.cc b/chromium/third_party/webrtc/common_video/incoming_video_stream.cc
index 8e715407ea6..b5a2c31a6d1 100644
--- a/chromium/third_party/webrtc/common_video/incoming_video_stream.cc
+++ b/chromium/third_party/webrtc/common_video/incoming_video_stream.cc
@@ -15,7 +15,6 @@
 #include "common_video/video_render_frames.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"
-#include "system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
 namespace {