Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/profiles/off_the_record_profile_impl_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/profiles/off_the_record_profile_impl.h"
 
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 60 matching lines @@
 // OffTheRecordProfileImpl ctor uses it in
 // ProfileIOData::InitializeProfileParams.
 class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
  protected:
   OffTheRecordProfileImplTest() {}
 
   virtual ~OffTheRecordProfileImplTest() {}
 
   virtual void SetUp() OVERRIDE {
     prefs_.reset(new TestingPrefServiceSimple);
-    chrome::RegisterLocalState(prefs_.get());
+    chrome::RegisterLocalState(prefs_->registry(), prefs_.get());
 
     browser_process()->SetLocalState(prefs_.get());
 
     BrowserWithTestWindowTest::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     BrowserWithTestWindowTest::TearDown();
     browser_process()->SetLocalState(NULL);
     DestroyBrowserAndProfile();
     prefs_.reset();
   }
 
  private:
   TestingBrowserProcess* browser_process() {
     return TestingBrowserProcess::GetGlobal();
   }
 
-  scoped_ptr<PrefServiceSimple> prefs_;
+  scoped_ptr<TestingPrefServiceSimple> prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImplTest);
 };
 
 // Test four things:
 //  1. Host zoom maps of parent profile and child profile are different.
 //  2. Child host zoom map inherites zoom level at construction.
 //  3. Change of zoom level doesn't propagate from child to parent.
 //  4. Change of zoom level propagate from parent to child.
 TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
@@ skipping 47 matching lines @@
             child_zoom_map->GetZoomLevel(host)) <<
                 "Child change must not propagate to parent.";
 
   parent_zoom_map->SetZoomLevel(host, zoom_level_40);
   ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_40);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevel(host),
             child_zoom_map->GetZoomLevel(host)) <<
                 "Parent change should propagate to child.";
 }