BASELINE: Update Chromium to 78.0.3904.130

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

2 files changed, 5 insertions, 4 deletions

diff --git a/chromium/base/power_monitor/power_monitor_device_source_win.cc b/chromium/base/power_monitor/power_monitor_device_source_win.cc
index 9aa677e42c5..f7351356307 100644
--- a/chromium/base/power_monitor/power_monitor_device_source_win.cc
+++ b/chromium/base/power_monitor/power_monitor_device_source_win.cc
@@ -4,12 +4,12 @@
 
 #include "base/power_monitor/power_monitor_device_source.h"
 
-#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_current.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_source.h"
-#include "base/win/wrapped_window_proc.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
+#include "base/win/wrapped_window_proc.h"
 
 namespace base {
 
diff --git a/chromium/base/power_monitor/power_monitor_unittest.cc b/chromium/base/power_monitor/power_monitor_unittest.cc
index 3d81d4f12cf..2f7e04485d8 100644
--- a/chromium/base/power_monitor/power_monitor_unittest.cc
+++ b/chromium/base/power_monitor/power_monitor_unittest.cc
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/power_monitor/power_monitor.h"
+
 #include "base/macros.h"
 #include "base/test/power_monitor_test_base.h"
-#include "base/test/scoped_task_environment.h"
+#include "base/test/task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -22,7 +23,7 @@ class PowerMonitorTest : public testing::Test {
   PowerMonitorTestSource* source() { return power_monitor_source_; }
 
  private:
-  test::ScopedTaskEnvironment scoped_task_environment_;
+  test::TaskEnvironment task_environment_;
   PowerMonitorTestSource* power_monitor_source_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerMonitorTest);