Add BatteryMonitorIntegrationBrowsertest::GetAdditionalMappedFilesForChildProcess for returning req…

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
Committed: https://crrev.com/e97add26342fadfb9be1d5e68a49e3e6eebbfe82
Cr-Commit-Position: refs/heads/master@{#312376}

[vivekg, 2015-01-19 09:01:25]

vivekg@chromium.org changed reviewers:
+ ppi@chromium.org

[vivekg, 2015-01-19 09:02:56]

vivekg@chromium.org changed reviewers:
+ vivekg@chromium.org

[vivekg, 2015-01-19 09:02:56]

jochen@, ppi@: PTAL, thank you.

[jochen (gone - plz use gerrit), 2015-01-19 13:00:18]

happy to rubberstamp once ppi approved

[vivekg, 2015-01-20 01:48:15]

ppi@, please let me know your feedback, thank you.

[vivekg, 2015-01-21 00:09:42]

@ppi, a friendly ping. Please take a look, thank you.

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

Sorry for the delay, I was ooo yesterday. Ptal at the comments below.

https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
File content/browser/battery_status/battery_monitor_integration_browsertest.cc
(right):

https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
content/browser/battery_status/battery_monitor_integration_browsertest.cc:17:
#if defined(OS_ANDROID)
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.

https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
content/browser/battery_status/battery_monitor_integration_browsertest.cc:99:
void GetAdditionalMappedFilesForChildProcess(
We shouldn't duplicate the code from ShellContentBrowserClient.

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

[vivekg, 2015-01-21 01:04:09]

On 2015/01/21 00:33:50, ppi wrote:
> Sorry for the delay, I was ooo yesterday. Ptal at the comments below.
> 

Thank you for your feedback.
>
https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
> File content/browser/battery_status/battery_monitor_integration_browsertest.cc
> (right):
> 
>
https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
> content/browser/battery_status/battery_monitor_integration_browsertest.cc:17:
> #if defined(OS_ANDROID)
> 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.
> 
>
https://codereview.chromium.org/845673004/diff/20001/content/browser/battery_...
> content/browser/battery_status/battery_monitor_integration_browsertest.cc:99:
> void GetAdditionalMappedFilesForChildProcess(
> We shouldn't duplicate the code from ShellContentBrowserClient.
> 
> Would it work to delegate / defer to
> ShellContentBrowserClient::Get()->GetAdditionalMappedFilesForChildProcess
here?

Yes indeed, this is the right approach. Have modified the patch accordingly,
PTAL.

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

Thanks. I'm happy if the trybots are happy, one nit below.

https://codereview.chromium.org/845673004/diff/40001/content/browser/battery_...
File content/browser/battery_status/battery_monitor_integration_browsertest.cc
(right):

https://codereview.chromium.org/845673004/diff/40001/content/browser/battery_...
content/browser/battery_status/battery_monitor_integration_browsertest.cc:93: }
nit: add a newline here

[vivekg, 2015-01-21 01:11:03]

On 2015/01/21 01:08:32, ppi wrote:
> Thanks. I'm happy if the trybots are happy, one nit below.
> 
>
https://codereview.chromium.org/845673004/diff/40001/content/browser/battery_...
> File content/browser/battery_status/battery_monitor_integration_browsertest.cc
> (right):
> 
>
https://codereview.chromium.org/845673004/diff/40001/content/browser/battery_...
> content/browser/battery_status/battery_monitor_integration_browsertest.cc:93:
}
> nit: add a newline here

Done.

[vivekg, 2015-01-21 02:18:50]

On 2015/01/21 01:08:32, ppi wrote:
> Thanks. I'm happy if the trybots are happy, one nit below.
> 
Most of the bots have turned green. There is some issue with
Linux_chromium_asan_rel which is re triggered. PTAL.

[ppi, 2015-01-21 02:20:49]

lgtm, thanks

[vivekg, 2015-01-21 02:29:12]

The CQ bit was checked by vivekg@chromium.org

[commit-bot: I haz the power, 2015-01-21 02:30:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/845673004/60001

[commit-bot: I haz the power, 2015-01-21 14:38:51]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-01-21 14:40:41]

Patchset 4 (id:??) landed as
https://crrev.com/e97add26342fadfb9be1d5e68a49e3e6eebbfe82
Cr-Commit-Position: refs/heads/master@{#312376}