Componentize MetricsService unittest

Componentize MetricsService unittest

The componentization is straightforward.

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

[Alexei Svitkine (slow), 2014-06-09 20:32:34]

lgtm

[blundell, 2014-06-11 09:41:44]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-06-11 09:42:34]

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

[commit-bot: I haz the power, 2014-06-11 19:12:01]

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

[commit-bot: I haz the power, 2014-06-11 19:12:02]

Failed to apply patch for components/metrics/metrics_service_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         components/metrics/metrics_service_unittest.cc
  Copied chrome/browser/metrics/metrics_service_unittest.cc ->
components/metrics/metrics_service_unittest.cc
  patching file components/metrics/metrics_service_unittest.cc
  Hunk #1 FAILED at 7.
  Hunk #2 succeeded at 70 (offset 1 line).
  Hunk #3 succeeded at 118 (offset 1 line).
  Hunk #4 succeeded at 158 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file
components/metrics/metrics_service_unittest.cc.rej

Patch:   NR 
chrome/browser/metrics/metrics_service_unittest.cc->components/metrics/metrics_service_unittest.cc
Index: components/metrics/metrics_service_unittest.cc
diff --git a/chrome/browser/metrics/metrics_service_unittest.cc
b/components/metrics/metrics_service_unittest.cc
similarity index 85%
rename from chrome/browser/metrics/metrics_service_unittest.cc
rename to components/metrics/metrics_service_unittest.cc
index
b75951d8797c0e349446b35ef359a30ac4f257e3..bd972598589d95b0d3a715dcf7f2d219f43fe628
100644
--- a/chrome/browser/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -7,24 +7,17 @@
 #include <string>
 
 #include "base/bind.h"
+#include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/browser/google/google_util.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/base/scoped_testing_local_state.h"
-#include "chrome/test/base/testing_browser_process.h"
 #include "components/metrics/metrics_log.h"
+#include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service_observer.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/test_metrics_service_client.h"
 #include "components/variations/metrics_util.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_CHROMEOS)
-#include "chromeos/login/login_state.h"
-#endif  // defined(OS_CHROMEOS)
-
 namespace {
 
 using metrics::MetricsLogManager;
@@ -69,23 +62,11 @@ class MetricsServiceTest : public testing::Test {
         GetLocalState(),
         base::Bind(&MetricsServiceTest::is_metrics_reporting_enabled,
                    base::Unretained(this)));
-#if defined(OS_CHROMEOS)
-    // TODO(blundell): Remove this code once MetricsService no longer creates
-    // ChromeOSMetricsProvider. Also remove the #include of login_state.h.
-    // (http://crbug.com/375776)
-    if (!chromeos::LoginState::IsInitialized())
-      chromeos::LoginState::Initialize();
-#endif  // defined(OS_CHROMEOS)
   }
 
   virtual ~MetricsServiceTest() {
     MetricsService::SetExecutionPhase(MetricsService::UNINITIALIZED_PHASE,
                                       GetLocalState());
-#if defined(OS_CHROMEOS)
-    // TODO(blundell): Remove this code once MetricsService no longer creates
-    // ChromeOSMetricsProvider.
-    chromeos::LoginState::Shutdown();
-#endif  // defined(OS_CHROMEOS)
   }
 
   metrics::MetricsStateManager* GetMetricsStateManager() {
@@ -129,10 +110,10 @@ class MetricsServiceTest : public testing::Test {
     return is_metrics_reporting_enabled_;
   }
 
-  content::TestBrowserThreadBundle thread_bundle_;
   bool is_metrics_reporting_enabled_;
   TestingPrefServiceSimple testing_local_state_;
   scoped_ptr<metrics::MetricsStateManager> metrics_state_manager_;
+  base::MessageLoop message_loop;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);
 };
@@ -169,35 +150,29 @@ TEST_F(MetricsServiceTest,
InitialStabilityLogAfterCleanShutDown) {
 }
 
 TEST_F(MetricsServiceTest, InitialStabilityLogAfterCrash) {
-  // TODO(asvitkine): Eliminate using |testing_local_state| in favor of using
-  // |GetLocalState()| once MetricsService no longer internally creates metrics
-  // providers that rely on g_browser_process->local_state() being correctly
-  // set up. crbug.com/375776.
-  ScopedTestingLocalState testing_local_state(
-      TestingBrowserProcess::GetGlobal());
-  TestingPrefServiceSimple* local_state = testing_local_state.Get();
   EnableMetricsReporting();
-  local_state->ClearPref(metrics::prefs::kStabilityExitedCleanly);
+  GetLocalState()->ClearPref(metrics::prefs::kStabilityExitedCleanly);
 
   // Set up prefs to simulate restarting after a crash.
 
   // Save an existing system profile to prefs, to correspond to what would be
   // saved from a previous session.
   metrics::TestMetricsServiceClient client;
-  TestMetricsLog log("client", 1, &client, local_state);
+  TestMetricsLog log("client", 1, &client, GetLocalState());
   log.RecordEnvironment(std::vector<metrics::MetricsProvider*>(),
                         std::vector<variations::ActiveGroupId>());
 
   // Record stability build time and version from previous session, so that
   // stability metrics (including exited cleanly flag) won't be cleared.
-  local_state->SetInt64(metrics::prefs::kStabilityStatsBuildTime,
+  GetLocalState()->SetInt64(metrics::prefs::kStabilityStatsBuildTime,
                         MetricsLog::GetBuildTime());
-  local_state->SetString(metrics::prefs::kStabilityStatsVersion,
+  GetLocalState()->SetString(metrics::prefs::kStabilityStatsVersion,
                          client.GetVersionString());
 
-  local_state->SetBoolean(metrics::prefs::kStabilityExitedCleanly, false);
+  GetLocalState()->SetBoolean(metrics::prefs::kStabilityExitedCleanly, false);
 
-  TestMetricsService service(GetMetricsStateManager(), &client, local_state);
+  TestMetricsService service(
+      GetMetricsStateManager(), &client, GetLocalState());
   service.InitializeMetricsRecordingState();
 
   // The initial stability log should be generated and persisted in unsent
logs.

[blundell, 2014-06-11 19:48:13]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-06-11 19:49:26]

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

[commit-bot: I haz the power, 2014-06-11 21:14:17]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  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_rel 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/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/15587)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/18727)

[commit-bot: I haz the power, 2014-06-11 21:18:39]

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

[commit-bot: I haz the power, 2014-06-11 21:18:40]

Try jobs failed on following builders:
  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/...)
  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_...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/15646)

[blundell, 2014-06-12 05:17:45]

The CQ bit was checked by blundell@chromium.org

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

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

[commit-bot: I haz the power, 2014-06-12 10:19:27]

Change committed as 276615