Rewrite the Android implementation of BatteryMonitor directly in Java.

content/browser/mojo/mojo_application_host.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
 #include "content/common/mojo/service_registry_impl.h"
@@ skipping 23 matching lines @@
   // Two-phase initialization:
   //  1- Init makes service_registry() available synchronously.
   //  2- Activate establishes the actual connection to the peer process.
   bool Init();
   void Activate(IPC::Sender* sender, base::ProcessHandle process_handle);
 
   void WillDestroySoon();
 
   ServiceRegistry* service_registry() { return &service_registry_; }
 
+#if defined(OS_ANDROID)
+  ServiceRegistryAndroid* service_registry_android() {
+    return service_registry_android_.get();
+  }
+#endif

[qsr, 2014/12/12 15:31:57]

Keep a space before private:

[ppi, 2014/12/12 16:02:16]

Done.

  private:
   mojo::embedder::ChannelInit channel_init_;
   mojo::embedder::ScopedPlatformHandle client_handle_;
 
   bool did_activate_;
 
   ServiceRegistryImpl service_registry_;
 
 #if defined(OS_ANDROID)
   scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_