sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 26dc5e3bde185a1e0e3752db6f10b76f93c0acfa..e217746c48369a1f16163a281a1fbdcd1aec03d4 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -121,8 +121,10 @@ class ProfileSyncServicePreferenceTest
 
     SigninManager* signin = new SigninManager();
     signin->SetAuthenticatedUsername("test");
+    ProfileSyncComponentsFactoryMock* factory =
+        new ProfileSyncComponentsFactoryMock();
     service_.reset(new TestProfileSyncService(
-        &factory_,
+        factory,
         profile_.get(),
         signin,
         ProfileSyncService::AUTO_START,
@@ -132,16 +134,16 @@ class ProfileSyncServicePreferenceTest
         prefs_->GetSyncableService());
     if (!pref_sync_service_)
       return false;
-    EXPECT_CALL(factory_, CreatePreferenceSyncComponents(_, _)).
+    EXPECT_CALL(*factory, CreatePreferenceSyncComponents(_, _)).
         WillOnce(BuildPrefSyncComponents(service_.get(),
                                          pref_sync_service_,
                                          &model_associator_,
                                          &change_processor_));
 
-    EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
+    EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
         WillOnce(ReturnNewDataTypeManager());
 
-    dtc_ = new PreferenceDataTypeController(&factory_,
+    dtc_ = new PreferenceDataTypeController(factory,
                                             profile_.get(),
                                             service_.get());
     service_->RegisterDataTypeController(dtc_);