diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/base/power_monitor | |
parent | e733310db58160074f574c429d48f8308c0afe17 (diff) |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/base/power_monitor')
-rw-r--r-- | chromium/base/power_monitor/power_monitor_device_source.cc | 4 | ||||
-rw-r--r-- | chromium/base/power_monitor/power_monitor_device_source.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/chromium/base/power_monitor/power_monitor_device_source.cc b/chromium/base/power_monitor/power_monitor_device_source.cc index d7060c2a228..5df58003375 100644 --- a/chromium/base/power_monitor/power_monitor_device_source.cc +++ b/chromium/base/power_monitor/power_monitor_device_source.cc @@ -4,13 +4,9 @@ #include "base/power_monitor/power_monitor_device_source.h" -#include "base/threading/thread_task_runner_handle.h" - namespace base { PowerMonitorDeviceSource::PowerMonitorDeviceSource() { - DCHECK(ThreadTaskRunnerHandle::IsSet()); - #if defined(OS_MACOSX) PlatformInit(); #endif diff --git a/chromium/base/power_monitor/power_monitor_device_source.h b/chromium/base/power_monitor/power_monitor_device_source.h index 69237cd6434..1e2c885fa45 100644 --- a/chromium/base/power_monitor/power_monitor_device_source.h +++ b/chromium/base/power_monitor/power_monitor_device_source.h @@ -7,8 +7,6 @@ #include "base/base_export.h" #include "base/macros.h" -#include "base/memory/ref_counted.h" -#include "base/observer_list_threadsafe.h" #include "base/power_monitor/power_monitor_source.h" #include "base/power_monitor/power_observer.h" #include "build/build_config.h" |