summaryrefslogtreecommitdiffstats
path: root/chromium/base/power_monitor
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 15:05:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:33:47 +0000
commite684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch)
treed55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/base/power_monitor
parent2b94bfe47ccb6c08047959d1c26e392919550e86 (diff)
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/power_monitor')
-rw-r--r--chromium/base/power_monitor/power_monitor_device_source_win.cc2
-rw-r--r--chromium/base/power_monitor/power_monitor_unittest.cc14
2 files changed, 8 insertions, 8 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 e74be50e2a2..37a4462ce7f 100644
--- a/chromium/base/power_monitor/power_monitor_device_source_win.cc
+++ b/chromium/base/power_monitor/power_monitor_device_source_win.cc
@@ -65,7 +65,7 @@ bool PowerMonitorDeviceSource::IsOnBatteryPowerImpl() {
PowerMonitorDeviceSource::PowerMessageWindow::PowerMessageWindow()
: instance_(NULL), message_hwnd_(NULL) {
- if (!MessageLoopForUI::IsCurrent()) {
+ if (!MessageLoopCurrentForUI::IsSet()) {
// Creating this window in (e.g.) a renderer inhibits shutdown on Windows.
// See http://crbug.com/230122. TODO(vandebo): http://crbug.com/236031
DLOG(ERROR)
diff --git a/chromium/base/power_monitor/power_monitor_unittest.cc b/chromium/base/power_monitor/power_monitor_unittest.cc
index 7f2a84b774b..71fb260c4d9 100644
--- a/chromium/base/power_monitor/power_monitor_unittest.cc
+++ b/chromium/base/power_monitor/power_monitor_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
#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 "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -23,7 +23,7 @@ class PowerMonitorTest : public testing::Test {
PowerMonitor* monitor() { return power_monitor_.get(); }
private:
- base::MessageLoop message_loop_;
+ test::ScopedTaskEnvironment scoped_task_environment_;
PowerMonitorTestSource* power_monitor_source_;
std::unique_ptr<PowerMonitor> power_monitor_;
@@ -36,8 +36,8 @@ TEST_F(PowerMonitorTest, PowerNotifications) {
const int kObservers = 5;
PowerMonitorTestObserver observers[kObservers];
- for (int index = 0; index < kObservers; ++index)
- monitor()->AddObserver(&observers[index]);
+ for (auto& index : observers)
+ monitor()->AddObserver(&index);
// Sending resume when not suspended should have no effect.
source()->GenerateResumeEvent();
@@ -46,8 +46,8 @@ TEST_F(PowerMonitorTest, PowerNotifications) {
// Pretend we suspended.
source()->GenerateSuspendEvent();
// Ensure all observers were notified of the event
- for (int index = 0; index < kObservers; ++index)
- EXPECT_EQ(observers[index].suspends(), 1);
+ for (const auto& index : observers)
+ EXPECT_EQ(index.suspends(), 1);
// Send a second suspend notification. This should be suppressed.
source()->GenerateSuspendEvent();