Decouple Power Monitor from //content.

device/power_monitor/power_monitor_broadcast_source.h

Index: device/power_monitor/power_monitor_broadcast_source.h
diff --git a/content/child/power_monitor_broadcast_source.h b/device/power_monitor/power_monitor_broadcast_source.h
similarity index 71%
rename from content/child/power_monitor_broadcast_source.h
rename to device/power_monitor/power_monitor_broadcast_source.h
index c5358eaed29978b583a3e7c82bb54348dab2d006..2a617822263dcf1eaf55776e8579f3ee8c3f70fd 100644
--- a/content/child/power_monitor_broadcast_source.h
+++ b/device/power_monitor/power_monitor_broadcast_source.h
@@ -2,26 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_CHILD_POWER_MONITOR_BROADCAST_SOURCE_H_
-#define CONTENT_CHILD_POWER_MONITOR_BROADCAST_SOURCE_H_
+#ifndef DEVICE_POWER_MONITOR_POWER_MONITOR_BROADCAST_SOURCE_H_
+#define DEVICE_POWER_MONITOR_POWER_MONITOR_BROADCAST_SOURCE_H_
 
 #include "base/macros.h"
 #include "base/power_monitor/power_monitor_source.h"
-#include "content/common/content_export.h"
+#include "device/power_monitor/power_monitor_export.h"
 #include "device/power_monitor/public/interfaces/power_monitor.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
-namespace content {
+namespace device {
 
 // Receives Power Monitor IPC messages sent from the browser process and relays
 // them to the PowerMonitor of the current process.
-class CONTENT_EXPORT PowerMonitorBroadcastSource
+class DEVICE_POWER_MONITOR_EXPORT PowerMonitorBroadcastSource
     : public base::PowerMonitorSource,
       NON_EXPORTED_BASE(public device::mojom::PowerMonitorClient) {
  public:
   explicit PowerMonitorBroadcastSource();
   ~PowerMonitorBroadcastSource() override;
 
+  void SetClient(device::mojom::PowerMonitor* power_monitor);

[blundell, 2016/10/28 21:33:51]

I think it would be nicer to just have PowerMonitorBroadcastSource be
initialized with an InterfaceProvider. Then it can do the client setup
completely internally.

[ke.he, 2016/10/29 11:10:53]

Done.

+
   void PowerStateChange(bool on_battery_power) override;
   void Suspend() override;
   void Resume() override;
@@ -34,6 +36,6 @@ class CONTENT_EXPORT PowerMonitorBroadcastSource
   DISALLOW_COPY_AND_ASSIGN(PowerMonitorBroadcastSource);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_CHILD_POWER_MONITOR_BROADCAST_SOURCE_H_
+#endif  // DEVICE_POWER_MONITOR_POWER_MONITOR_BROADCAST_SOURCE_H_