[Device Service] Move PowerMonitor into the Device Service

content/browser/service_manager/service_manager_context.cc

Index: content/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index 7fd2cf5d696bd858a60f03d25867849da8fcf33d..9ab9cd4d1fc029f513dd8e404fa3f0a69712c4ec 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -30,6 +30,8 @@
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/catalog/store.h"
+#include "services/device/device_service.h"
+#include "services/device/public/cpp/constants.h"
 #include "services/file/public/interfaces/constants.mojom.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/native_runner.h"
@@ -255,6 +257,14 @@ ServiceManagerContext::ServiceManagerContext() {
       std::move(request),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
 
+  // Serves processes other than renderer, such as gpu, plugin, utility etc.

[leonhsl(Using Gerrit), 2016/11/17 10:28:03]

Maybe we should let the device service here also serve renderer process? We can
remove those browser context specific device services, then let renderer process
also connect to this global one.

[blundell, 2016/11/22 16:46:44]

Sorry, I didn't understand this question. Could you expand?

+  ServiceInfo device_info;
+  device_info.factory =
+      base::Bind(&device::CreateDeviceService,
+                 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE));
+  ServiceManagerConnection::GetForProcess()->AddEmbeddedService(
+      device::kDeviceServiceName, device_info);
+
   ContentBrowserClient::StaticServiceMap services;
   GetContentClient()->browser()->RegisterInProcessServices(&services);
   for (const auto& entry : services) {