[Device Service] Move PowerMonitor into the Device Service

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index a1fe2f4b6dedc0a01b7833536130d87e654c5c9c..91dca81ab06112b225dea178b638035912356f52 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -66,6 +66,7 @@
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "mojo/public/cpp/system/buffer.h"
 #include "mojo/public/cpp/system/platform_handle.h"
+#include "services/device/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -509,10 +510,18 @@ void ChildThreadImpl::Init(const Options& options) {
     channel_->AddFilter(new ChildMemoryMessageFilter());
   }
 
-  // In single process mode we may already have a power monitor
-  if (!base::PowerMonitor::Get()) {
-    std::unique_ptr<device::PowerMonitorBroadcastSource> power_monitor_source(
-        new device::PowerMonitorBroadcastSource(GetRemoteInterfaces()));
+  // In single process mode we may already have a power monitor,
+  // also for some edge cases where there is no ServiceManagerConnection, we do
+  // not create the power monitor.
+  if (!base::PowerMonitor::Get() && service_manager_connection_) {
+    std::unique_ptr<service_manager::Connection> device_connection =
+        service_manager_connection_->GetConnector()->Connect(
+            device::mojom::kServiceName);
+    service_manager::InterfaceProvider* remote_interfaces =
+        device_connection->GetRemoteInterfaces();

[blundell, 2017/01/03 15:20:50]

nit: This could just be inlined into line 524 below.

[leonhsl(Using Gerrit), 2017/01/04 04:56:27]

Done.

+    auto power_monitor_source =
+        base::MakeUnique<device::PowerMonitorBroadcastSource>(
+            remote_interfaces);
 
     power_monitor_.reset(
         new base::PowerMonitor(std::move(power_monitor_source)));