Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/ui/tab_contents/tab_contents_iterator_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/ui/tab_contents/tab_contents_iterator.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 
@@ skipping 126 matching lines @@
 #if defined(OS_CHROMEOS)
 // Calling AttemptRestart on ChromeOS will exit the test.
 #define MAYBE_AttemptRestart DISABLED_AttemptRestart
 #else
 #define MAYBE_AttemptRestart AttemptRestart
 #endif
 
 TEST_F(BrowserListTest, MAYBE_AttemptRestart) {
   ASSERT_TRUE(g_browser_process);
   TestingPrefServiceSimple testing_pref_service;
-  testing_pref_service.RegisterBooleanPref(prefs::kWasRestarted, false);
-  testing_pref_service.RegisterBooleanPref(prefs::kRestartLastSessionOnShutdown,
-                                           false);
+  testing_pref_service.registry()->RegisterBooleanPref(
+      prefs::kWasRestarted, false);
+  testing_pref_service.registry()->RegisterBooleanPref(
+      prefs::kRestartLastSessionOnShutdown,
+      false);
 
   TestingBrowserProcess* testing_browser_process =
       TestingBrowserProcess::GetGlobal();
   testing_browser_process->SetLocalState(&testing_pref_service);
   ASSERT_TRUE(g_browser_process->local_state());
   ProfileManager* profile_manager = new ProfileManager(FilePath());
   testing_browser_process->SetProfileManager(profile_manager);
 
   browser::AttemptRestart();
   // Cancel the effects of us calling browser::AttemptRestart. Otherwise tests
   // ran after this one will fail.
   browser_shutdown::SetTryingToQuit(false);
 
   EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));
   testing_browser_process->SetLocalState(NULL);
 }