sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/sync_setup_wizard_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 "chrome/browser/sync/sync_setup_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 41 matching lines @@
     ShowSetupDone(string16());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSyncSetupHandler);
 };
 
 // A PSS subtype to inject.
 class ProfileSyncServiceForWizardTest : public ProfileSyncService {
  public:
-  ProfileSyncServiceForWizardTest(ProfileSyncComponentsFactory* factory,
-                                  Profile* profile,
+  ProfileSyncServiceForWizardTest(Profile* profile,
                                   ProfileSyncService::StartBehavior behavior)
-      : ProfileSyncService(factory, profile, new SigninManager(), behavior),
+      : ProfileSyncService(NULL, profile, new SigninManager(), behavior),
         user_cancelled_dialog_(false),
         is_using_secondary_passphrase_(false),
         encrypt_everything_(false) {
     ResetTestStats();
   }
 
   virtual ~ProfileSyncServiceForWizardTest() {}
 
   virtual void OnUserSubmittedAuth(const std::string& username,
                                    const std::string& password,
@@ skipping 93 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceForWizardTest);
 };
 
 class TestingProfileWithSyncService : public TestingProfile {
  public:
   explicit TestingProfileWithSyncService(
       ProfileSyncService::StartBehavior behavior) {
     sync_service_.reset(new ProfileSyncServiceForWizardTest(
-        &factory_, this, behavior));
+        this, behavior));
   }
 
   virtual ProfileSyncService* GetProfileSyncService() {
     return sync_service_.get();
   }
  private:
   ProfileSyncComponentsFactoryMock factory_;
   scoped_ptr<ProfileSyncService> sync_service_;
 };
 
@@ skipping 434 matching lines @@
   dialog_args.GetInteger("error", &error);
   EXPECT_EQ(0, error);
   bool editable = true;
   dialog_args.GetBoolean("editable_user", &editable);
   EXPECT_FALSE(editable);
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   EXPECT_TRUE(service_->user_cancelled_dialog_);
   EXPECT_TRUE(service_->profile()->GetPrefs()->GetBoolean(
       prefs::kSyncHasSetupCompleted));
 }