Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/metrics/metrics_service_uitest.cc

 // Copyright (c) 2006-2008 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.
 
 // Tests the MetricsService stat recording to make sure that the numbers are
 // what we expect.
 
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 34 matching lines @@
     ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(page2_path)));
   }
 
   // Get a PrefService whose contents correspond to the Local State file
   // that was saved by the app as it closed.  The caller takes ownership of the
   // returned PrefService object.
   PrefService* GetLocalState() {
     FilePath local_state_path = user_data_dir()
         .Append(chrome::kLocalStateFilename);
 
-    PrefService* local_state(new PrefService(local_state_path, NULL));
-    return local_state;
+    return new PrefService(local_state_path);
   }
 };
 
 TEST_F(MetricsServiceTest, CloseRenderersNormally) {
   OpenTabs();
   QuitBrowser();
 
   scoped_ptr<PrefService> local_state(GetLocalState());
   local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true);
   local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0);
@@ skipping 38 matching lines @@
   scoped_ptr<PrefService> local_state(GetLocalState());
   local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true);
   local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0);
   local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0);
   local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
   EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly));
   EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount));
   EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount));
   EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
 }