diff options
| author | vivek.vg <vivek.vg@samsung.com> | 2015-01-21 06:38:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 14:40:01 +0000 |
| commit | e97add26342fadfb9be1d5e68a49e3e6eebbfe82 (patch) | |
| tree | 0100e387181b630bf1a7f3941c9fccab5ca5a7f0 /content | |
| parent | 05b2c7ba7ea3bd77f9d32a28f45c7d51c9348d76 (diff) | |
| download | chromium_src-e97add26342fadfb9be1d5e68a49e3e6eebbfe82.zip chromium_src-e97add26342fadfb9be1d5e68a49e3e6eebbfe82.tar.gz chromium_src-e97add26342fadfb9be1d5e68a49e3e6eebbfe82.tar.bz2 | |
Add BatteryMonitorIntegrationBrowsertest::GetAdditionalMappedFilesForChildProcess for returning required pak files.
BatteryMonitorIntegrationBrowsertest overrides ContentBrowserClient for service registration.
In order to land [1], we have to ensure that the client is capable of returning the required pak files for this
migration.
[1] https://codereview.chromium.org/849163003
R=jochen@chromium.org, ppi@chromium.org
BUG=312586
Review URL: https://codereview.chromium.org/845673004
Cr-Commit-Position: refs/heads/master@{#312376}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/battery_status/battery_monitor_integration_browsertest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc index 7b60ff6..8bf1ca4 100644 --- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc +++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc @@ -91,6 +91,16 @@ class TestContentBrowserClient : public ContentBrowserClient { void OverrideRenderProcessMojoServices(ServiceRegistry* registry) override { registry->AddService(base::Bind(&FakeBatteryMonitor::Create)); } + +#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 { |