Add BatteryMonitorIntegrationBrowsertest::GetAdditionalMappedFilesForChildProcess for returning req…

content/browser/battery_status/battery_monitor_integration_browsertest.cc

 // 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.
 
 #include "base/callback_list.h"
 #include "base/lazy_instance.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
@@ skipping 72 matching lines @@
   mojo::StrongBinding<BatteryMonitor> binding_;
   BatteryStatusCallback callback_;
 };
 
 // Overrides the default service implementation with the test implementation
 // declared above.
 class TestContentBrowserClient : public ContentBrowserClient {
  public:
   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 {
  public:
   BatteryMonitorIntegrationTest() {}
 
   void SetUpOnMainThread() override {
     old_client_ = SetBrowserClientForTesting(&test_client_);
   }
 
@@ skipping 54 matching lines @@
   TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1);
   status.level = 0.6;
   UpdateBattery(status);
   same_tab_observer2.Wait();
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content