Move initial metrics gathering tasks out of MetricsService.

chrome/browser/metrics/metrics_service_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/metrics_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 260 matching lines @@
   EXPECT_EQ(3U, synthetic_trials.size());
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial1", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial2", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial3", "Group3"));
   service.log_manager_.FinishCurrentLog();
 }
 
 TEST_F(MetricsServiceTest, MetricsServiceObserver) {
   metrics::TestMetricsServiceClient client;
   MetricsService service(GetMetricsStateManager(), &client, GetLocalState());
+  service.InitializeMetricsRecordingState();

[blundell, 2014/05/27 15:55:49]

Needed due to the client causing a MetricsService codepath that wasn't
previously exercised by this test to now be exercised.

   TestMetricsServiceObserver observer1;
   TestMetricsServiceObserver observer2;
 
   service.AddObserver(&observer1);
   EXPECT_EQ(0, observer1.observed());
   EXPECT_EQ(0, observer2.observed());
 
   service.OpenNewLog();
   EXPECT_EQ(1, observer1.observed());
   EXPECT_EQ(0, observer2.observed());
   service.log_manager_.FinishCurrentLog();
 
   service.AddObserver(&observer2);
 
   service.OpenNewLog();
   EXPECT_EQ(2, observer1.observed());
   EXPECT_EQ(1, observer2.observed());
   service.log_manager_.FinishCurrentLog();
 
   service.RemoveObserver(&observer1);
 
   service.OpenNewLog();
   EXPECT_EQ(2, observer1.observed());
   EXPECT_EQ(2, observer2.observed());
   service.log_manager_.FinishCurrentLog();
 
   service.RemoveObserver(&observer2);
 }