[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 fe9651229ad9bd52feadcd44ad6f4d7d5ed3f710..4e3658ac45f061c689940def40eb4cd4aca0d1a5 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/interfaces/constants.mojom.h"
 #include "services/file/public/interfaces/constants.mojom.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -274,6 +276,15 @@ ServiceManagerContext::ServiceManagerContext() {
       std::move(request),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
 
+  // Registers the singletion device service to be embedded by browser service
+  // for now.

[blundell, 2017/01/06 12:28:09]

I would eliminate this comment; I don't think it adds too much information and
the Device Service will likely continue to be embedded in the browser process in
the long term.

[leonhsl(Using Gerrit), 2017/01/06 14:36:00]

Done.

+  ServiceInfo device_info;
+  device_info.factory =
+      base::Bind(&device::CreateDeviceService,
+                 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE));
+  ServiceManagerConnection::GetForProcess()->AddEmbeddedService(
+      device::mojom::kServiceName, device_info);
+
   ContentBrowserClient::StaticServiceMap services;
   GetContentClient()->browser()->RegisterInProcessServices(&services);
   for (const auto& entry : services) {
@@ -315,6 +326,13 @@ ServiceManagerContext::ServiceManagerContext() {
   ServiceManagerConnection::GetForProcess()->AddServiceRequestHandler(
       "media", base::Bind(&StartServiceInGpuProcess, "media"));
 #endif
+
+  // Initiates the first connection to device service to create the singleton
+  // instance, later the same instance will serve all the clients wanting to

[blundell, 2017/01/06 12:28:09]

Add below this:

TODO(rockot): Eliminate this connection once content_browser is itself a
singleton service.

[leonhsl(Using Gerrit), 2017/01/06 14:36:00]

OK I added a task to Ken :) Done.

+  // connect to device service.
+  std::unique_ptr<service_manager::Connection> device_connection =
+      ServiceManagerConnection::GetForProcess()->GetConnector()->Connect(
+          device::mojom::kServiceName);
 }
 
 ServiceManagerContext::~ServiceManagerContext() {