Port BatteryMonitor into Device Service

services/device/device_service.cc

Index: services/device/device_service.cc
diff --git a/services/device/device_service.cc b/services/device/device_service.cc
index 229695f19479593edfdeba9c5770079911bec358..1bed57a6ad7ffce9615bd09127ae15b8ab006c3f 100644
--- a/services/device/device_service.cc
+++ b/services/device/device_service.cc
@@ -8,11 +8,21 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "device/battery/battery_monitor.mojom.h"
+#include "device/battery/battery_monitor_impl.h"
+#include "device/battery/battery_status_service.h"
 #include "device/power_monitor/power_monitor_message_broadcaster.h"
 #include "device/time_zone_monitor/time_zone_monitor.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/context_utils.h"
+#include "base/android/jni_android.h"
+#include "jni/InterfaceRegistrar_jni.h"
+#endif
+
 namespace device {
 
 std::unique_ptr<service_manager::Service> CreateDeviceService(
@@ -22,9 +32,18 @@ std::unique_ptr<service_manager::Service> CreateDeviceService(
 
 DeviceService::DeviceService(
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
-    : file_task_runner_(std::move(file_task_runner)) {}
+    :
+#if defined(OS_ANDROID)
+      java_interface_provider_initialized_(false),
+#endif
+      file_task_runner_(std::move(file_task_runner)) {
+}
 
-DeviceService::~DeviceService() {}
+DeviceService::~DeviceService() {

[timvolodine, 2017/01/25 18:54:39]

when does this happen?

[blundell, 2017/01/26 08:42:08]

Please see the comment that I left on browser_main_loop.cc in PS#7, which
explains this issue and has a question for you about whether the behavioral
change is OK.

+#if !defined(OS_ANDROID)
+  device::BatteryStatusService::GetInstance()->Shutdown();
+#endif
+}
 
 void DeviceService::OnStart() {}
 
@@ -32,9 +51,24 @@ bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
                               service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::PowerMonitor>(this);
   registry->AddInterface<mojom::TimeZoneMonitor>(this);
+
+#if defined(OS_ANDROID)
+  registry->AddInterface(
+      GetJavaInterfaceProvider()->CreateInterfaceFactory<BatteryMonitor>());
+#else
+  registry->AddInterface<BatteryMonitor>(this);
+#endif
+
   return true;
 }
 
+#if !defined(OS_ANDROID)
+void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           BatteryMonitorRequest request) {
+  device::BatteryMonitorImpl::Create(std::move(request));
+}
+#endif
+
 void DeviceService::Create(const service_manager::Identity& remote_identity,
                            mojom::PowerMonitorRequest request) {
   PowerMonitorMessageBroadcaster::Create(std::move(request));
@@ -47,4 +81,21 @@ void DeviceService::Create(const service_manager::Identity& remote_identity,
   time_zone_monitor_->Bind(std::move(request));
 }
 
+#if defined(OS_ANDROID)
+service_manager::InterfaceProvider* DeviceService::GetJavaInterfaceProvider() {
+  if (!java_interface_provider_initialized_) {
+    service_manager::mojom::InterfaceProviderPtr provider;
+    JNIEnv* env = base::android::AttachCurrentThread();
+    Java_InterfaceRegistrar_createInterfaceRegistryForContext(
+        env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(),
+        base::android::GetApplicationContext());
+    java_interface_provider_.Bind(std::move(provider));
+
+    java_interface_provider_initialized_ = true;
+  }
+
+  return &java_interface_provider_;
+}
+#endif
+
 }  // namespace device