Remove dependencies of Metrics{Service,Log} on g_browser_process->local_state()

Remove dependencies of Metrics{Service,Log} on g_browser_process->local_state()

This CL changes MetricsService and MetricsLog to take in a |local_state| param
in their constructors. It additionally changes several static MetricsService
functions to take in a |local_state| param.

BUG=374299, 374300
TBR=jochen

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272833

[Alexei Svitkine (slow), 2014-05-19 13:13:53]

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service.cc (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.cc:1104: if (!local_state_) {
Nit: Shouldn't be possible - just remove this if.

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.cc:1892: DCHECK(local_state_);
I think we can just have a single DCHECK in the ctor and remove all the other
DCHECKs on local_state_ from this file.

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service.h (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.h:640: static bool
IsMetricsReportingEnabled(const PrefService* local_state);
Hmm, so we have a separate bug to move MetricsServiceHelper to its own file (and
eventually for it to go through MetricsStateManager) - so with that eventual
goal, we wouldn't need these params to be passed anyway. (Sorry that I didn't
make that clear on the bug... my bad.)

Given the above, I think this part can be reverted.

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service_unittest.cc (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service_unittest.cc:98:
chrome::RegisterLocalState(testing_local_state_.registry());
Instead of calling this, could this call MetricsService::RegisterPrefs()? Same
for the other test.

[blundell, 2014-05-19 13:49:28]

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service.cc (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.cc:1104: if (!local_state_) {
On 2014/05/19 13:13:54, Alexei Svitkine wrote:
> Nit: Shouldn't be possible - just remove this if.

Done.

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.cc:1892: DCHECK(local_state_);
On 2014/05/19 13:13:54, Alexei Svitkine wrote:
> I think we can just have a single DCHECK in the ctor and remove all the other
> DCHECKs on local_state_ from this file.

Done.

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service.h (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.h:640: static bool
IsMetricsReportingEnabled(const PrefService* local_state);
Are we not going to need to access this API from the component? I thought that
MetricsServiceHelper was going to become the //chrome implementation of a
component-level interface.

On 2014/05/19 13:13:54, Alexei Svitkine wrote:
> Hmm, so we have a separate bug to move MetricsServiceHelper to its own file
(and
> eventually for it to go through MetricsStateManager) - so with that eventual
> goal, we wouldn't need these params to be passed anyway. (Sorry that I didn't
> make that clear on the bug... my bad.)
> 
> Given the above, I think this part can be reverted.

[Alexei Svitkine (slow), 2014-05-19 13:53:44]

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
File chrome/browser/metrics/metrics_service.h (right):

https://codereview.chromium.org/282093012/diff/20001/chrome/browser/metrics/m...
chrome/browser/metrics/metrics_service.h:640: static bool
IsMetricsReportingEnabled(const PrefService* local_state);
On 2014/05/19 13:49:28, blundell wrote:
> Are we not going to need to access this API from the component? I thought that
> MetricsServiceHelper was going to become the //chrome implementation of a
> component-level interface.

Not quite. The idea is that the implementation should be in
MetricsServiceHelper, but to also have a ChromeMetricsServiceHelper that extends
it just to provide the friend declarations above.

The MetricsServiceHelper should just be an accessor over MetricsService (or
other classes e.g. MetricsStateManager), so it shouldn't need an additional
local_state param.

[blundell, 2014-05-19 14:50:35]

Thanks! Reverted MetricsServiceHelper changes and changed the tests to register
only the metrics-specific prefs.

[Alexei Svitkine (slow), 2014-05-19 15:01:55]

lgtm

[blundell, 2014-05-19 15:08:06]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-19 15:08:34]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/80001

[commit-bot: I haz the power, 2014-05-19 18:40:21]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[commit-bot: I haz the power, 2014-05-19 18:43:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-19 18:43:13]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)

[blundell, 2014-05-20 05:28:58]

TBR=jochen for chrome_browser_main

[blundell, 2014-05-20 05:29:03]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-20 05:29:41]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/80001

[commit-bot: I haz the power, 2014-05-20 05:50:51]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[commit-bot: I haz the power, 2014-05-20 05:53:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 05:53:47]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[blundell, 2014-05-20 07:48:54]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-20 07:49:28]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/70009

[commit-bot: I haz the power, 2014-05-20 11:09:39]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[commit-bot: I haz the power, 2014-05-20 11:38:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 11:38:10]

Try jobs failed on following builders:
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)

[blundell, 2014-05-20 11:44:46]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-20 11:45:07]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/100001

[commit-bot: I haz the power, 2014-05-20 14:52:04]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[commit-bot: I haz the power, 2014-05-20 14:54:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 14:54:51]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[blundell, 2014-05-20 18:59:57]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-20 19:01:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/120001

[commit-bot: I haz the power, 2014-05-20 19:55:48]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)
  ios_dbg_simulator on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...)
  ios_rel_device on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...)
  ios_rel_device_ninja on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device_ninja/...)
  linux_chromium_chromeos_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[commit-bot: I haz the power, 2014-05-20 20:06:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 20:06:34]

Try jobs failed on following builders:
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[blundell, 2014-05-20 22:06:21]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-20 22:07:55]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/140001

[jochen (gone - plz use gerrit), 2014-05-21 08:47:31]

lgtm

[commit-bot: I haz the power, 2014-05-21 20:02:17]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[commit-bot: I haz the power, 2014-05-22 00:47:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-22 00:47:46]

Try jobs failed on following builders:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[blundell, 2014-05-22 07:52:50]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-22 07:55:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/140001

[commit-bot: I haz the power, 2014-05-22 08:17:49]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[commit-bot: I haz the power, 2014-05-22 08:25:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-22 08:25:22]

Try jobs failed on following builders:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[blundell, 2014-05-22 13:50:20]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-22 13:50:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/140001

[commit-bot: I haz the power, 2014-05-22 13:57:59]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[commit-bot: I haz the power, 2014-05-22 14:16:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-22 14:16:30]

Try jobs failed on following builders:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[blundell, 2014-05-25 09:36:34]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-25 09:36:40]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/220001

[blundell, 2014-05-25 10:28:31]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-25 10:28:46]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/240001

[commit-bot: I haz the power, 2014-05-25 13:27:44]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-05-25 13:32:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-25 13:32:14]

Try jobs failed on following builders:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)

[blundell, 2014-05-26 05:53:49]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-05-26 05:53:59]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/blundell@chromium.org/282093012/240001

[commit-bot: I haz the power, 2014-05-26 15:59:36]

Change committed as 272833