sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

-// 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.
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
@@ skipping 102 matching lines @@
     AbstractProfileSyncServiceTest::TearDown();
   }
 
   bool StartSyncService(const base::Closure& callback,
                         bool will_fail_association) {
     if (service_.get())
       return false;
 
     SigninManager* signin = new SigninManager();
     signin->SetAuthenticatedUsername("test");
+    ProfileSyncComponentsFactoryMock* factory =
+        new ProfileSyncComponentsFactoryMock();
     service_.reset(new TestProfileSyncService(
-        &factory_,
+        factory,
         profile_.get(),
         signin,
         ProfileSyncService::AUTO_START,
         false,
         callback));
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         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_);
     profile_->GetTokenService()->IssueAuthTokenForTest(
         GaiaConstants::kSyncService, "token");
 
     service_->Initialize();
     MessageLoop::current()->Run();
     return true;
   }
@@ skipping 422 matching lines @@
   EXPECT_FALSE(pref->IsDefaultValue());
   // There should be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
   // Switch kHomePage back to unmanaged.
   profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
   // The original value should be picked up.
   EXPECT_TRUE(pref->IsDefaultValue());
   // There should still be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
 }