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/path_service.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"
 #include "content/public/common/service_registry.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
+#if defined(OS_ANDROID)

[ppi, 2015/01/21 00:33:50]

Jochen will correct me if I'm wrong, but I thing we tend to put conditional
includes in a separate section after the regular ones.

+#include "content/shell/android/shell_descriptors.h"
+#endif
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "device/battery/battery_monitor.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 // These tests run against a dummy implementation of the BatteryMonitor service.
 // That is, they verify that the service implementation is correctly exposed to
 // the renderer, whatever the implementation is.
 
 namespace content {
@@ skipping 58 matching lines @@
   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));
   }
+#if defined(OS_ANDROID)
+  void GetAdditionalMappedFilesForChildProcess(

[ppi, 2015/01/21 00:33:50]

We shouldn't duplicate the code from ShellContentBrowserClient.

Would it work to delegate / defer to
ShellContentBrowserClient::Get()->GetAdditionalMappedFilesForChildProcess here?

+      const base::CommandLine& command_line,
+      int child_process_id,
+      FileDescriptorInfo* mappings) override {
+    int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
+    base::FilePath pak_file;
+    bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file);
+    CHECK(r);
+    pak_file = pak_file.Append(FILE_PATH_LITERAL("paks"));
+    pak_file = pak_file.Append(FILE_PATH_LITERAL("content_shell.pak"));
+
+    base::File f(pak_file, flags);
+    if (!f.IsValid()) {
+      NOTREACHED() << "Failed to open file when creating renderer process: "
+                   << "content_shell.pak";
+    }
+
+    mappings->Transfer(kShellPakDescriptor,
+                       base::ScopedFD(f.TakePlatformFile()));
+  }
+#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