Add BatteryMonitorIntegrationBrowsertest::GetAdditionalMappedFilesForChildProcess for returning req…

content/browser/battery_status/battery_monitor_integration_browsertest.cc

Index: content/browser/battery_status/battery_monitor_integration_browsertest.cc
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
index 7b60ff60a2a8092b52a839bcce10e5ef40bb0589..08e80d881b4ef9063564922ce9bd2e6beb616a5e 100644
--- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc
+++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
@@ -91,6 +91,15 @@ class TestContentBrowserClient : public ContentBrowserClient {
   void OverrideRenderProcessMojoServices(ServiceRegistry* registry) override {
     registry->AddService(base::Bind(&FakeBatteryMonitor::Create));
   }

[ppi, 2015/01/21 01:08:32]

nit: add a newline here

+#if defined(OS_ANDROID)
+  void GetAdditionalMappedFilesForChildProcess(
+      const base::CommandLine& command_line,
+      int child_process_id,
+      FileDescriptorInfo* mappings) override {
+    ShellContentBrowserClient::Get()->GetAdditionalMappedFilesForChildProcess(
+        command_line, child_process_id, mappings);
+  }
+#endif  // defined(OS_ANDROID)
 };
 
 class BatteryMonitorIntegrationTest : public ContentBrowserTest {