Remove a bunch of GetProfileSyncService callers to use the new factory.

chrome/browser/sync/sync_setup_wizard_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/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"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/signin_manager_fake.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
 #include "chrome/common/net/gaia/google_service_auth_error.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_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 56 matching lines @@
 
   AuthError auth_error_;
   std::string username_;
   std::string password_;
   std::string captcha_;
 };
 
 // A PSS subtype to inject.
 class ProfileSyncServiceForWizardTest : public ProfileSyncService {
  public:
-  ProfileSyncServiceForWizardTest(Profile* profile,
-                                  ProfileSyncService::StartBehavior behavior)
-      : ProfileSyncService(NULL, profile, NULL, behavior),
-        user_cancelled_dialog_(false),
-        is_using_secondary_passphrase_(false),
-        encrypt_everything_(false) {
-    signin_ = &mock_signin_;
-    ResetTestStats();
+  virtual ~ProfileSyncServiceForWizardTest() {}
+
+  static ProfileKeyedService* BuildManual(Profile* profile) {
+    return new ProfileSyncServiceForWizardTest(profile,
+        ProfileSyncService::MANUAL_START);
   }
 
-  virtual ~ProfileSyncServiceForWizardTest() {}
+  static ProfileKeyedService* BuildAuto(Profile* profile) {
+    return new ProfileSyncServiceForWizardTest(profile,
+        ProfileSyncService::AUTO_START);
+  }
 
   virtual void OnUserChoseDatatypes(
       bool sync_everything, syncable::ModelTypeSet chosen_types) OVERRIDE {
     user_chose_data_types_ = true;
     chosen_data_types_ = chosen_types;
   }
 
   virtual void OnUserCancelledDialog() OVERRIDE {
     user_cancelled_dialog_ = true;
   }
@@ skipping 57 matching lines @@
   SigninManagerMock mock_signin_;
   bool user_cancelled_dialog_;
   bool user_chose_data_types_;
   bool keep_everything_synced_;
   bool is_using_secondary_passphrase_;
   bool encrypt_everything_;
   syncable::ModelTypeSet chosen_data_types_;
   std::string passphrase_;
 
  private:
+  ProfileSyncServiceForWizardTest(Profile* profile,
+                                  ProfileSyncService::StartBehavior behavior)
+      : ProfileSyncService(NULL, profile, NULL, behavior),
+        user_cancelled_dialog_(false),
+        is_using_secondary_passphrase_(false),
+        encrypt_everything_(false) {
+    signin_ = &mock_signin_;
+    ResetTestStats();
+  }
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceForWizardTest);
 };
 
-class TestingProfileWithSyncService : public TestingProfile {
- public:
-  explicit TestingProfileWithSyncService(
-      ProfileSyncService::StartBehavior behavior) {
-    sync_service_.reset(new ProfileSyncServiceForWizardTest(
-        this, behavior));
-  }
-
-  virtual ProfileSyncService* GetProfileSyncService() {
-    return sync_service_.get();
-  }
- private:
-  ProfileSyncComponentsFactoryMock factory_;
-  scoped_ptr<ProfileSyncService> sync_service_;
-};
-
 // TODO(jhawkins): Subclass Browser (specifically, ShowOptionsTab) and inject it
 // here to test the visibility of the Sync UI.
 class SyncSetupWizardTest : public BrowserWithTestWindowTest {
  public:
   SyncSetupWizardTest()
       : wizard_(NULL),
         service_(NULL),
         flow_(NULL) {}
   virtual ~SyncSetupWizardTest() {}
   virtual TestingProfile* BuildProfile() {
-    return new TestingProfileWithSyncService(
-        ProfileSyncService::MANUAL_START);
+    TestingProfile* profile = new TestingProfile();
+    ProfileSyncServiceFactory::GetInstance()->SetTestingFactory(profile,
+        ProfileSyncServiceForWizardTest::BuildManual);
+    return profile;
   }
   virtual void SetUp() {
     set_profile(BuildProfile());
     profile()->CreateBookmarkModel(false);
     // Wait for the bookmarks model to load.
     profile()->BlockUntilBookmarkModelLoaded();
     PrefService* prefs = profile()->GetPrefs();
     prefs->SetString(prefs::kGoogleServicesUsername, kTestUser);
 
     set_browser(new Browser(Browser::TYPE_TABBED, profile()));
     browser()->SetWindowForTesting(window());
     BrowserList::SetLastActive(browser());
     service_ = static_cast<ProfileSyncServiceForWizardTest*>(
-        profile()->GetProfileSyncService());
+        ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile()));
     wizard_ = service_->GetWizard();
   }
 
   virtual void TearDown() {
     wizard_ = NULL;
     service_ = NULL;
     flow_ = NULL;
   }
 
  protected:
@@ skipping 371 matching lines @@
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   CloseSetupUI();
   EXPECT_FALSE(wizard_->IsVisible());
 }
 
 class SyncSetupWizardCrosTest : public SyncSetupWizardTest {
  public:
   virtual TestingProfile* BuildProfile() {
-    TestingProfile* profile =
-        new TestingProfileWithSyncService(ProfileSyncService::AUTO_START);
-    profile->GetProfileSyncService()->signin()->SetAuthenticatedUsername(
-        kTestUser);
+    TestingProfile* profile = new TestingProfile();
+    ProfileSyncServiceFactory* f = ProfileSyncServiceFactory::GetInstance();
+    f->SetTestingFactory(profile, ProfileSyncServiceForWizardTest::BuildAuto);
+    f->GetForProfile(profile)->signin()->SetAuthenticatedUsername(kTestUser);

[Andrew T Wilson (Slow), 2012/01/27 00:22:40]

BTW, you could glom this into one huge ugly statement using
SetTestingFactoryAndUse()...but it's probably better as-is.

     return profile;
   }
 };
 
 // Tests a scenario where sync is disabled on chrome os on startup due to
 // an auth error (application specific password is needed).
 TEST_F(SyncSetupWizardCrosTest, CrosAuthSetup) {
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
 
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_SUCCESS, flow_->end_state_);
 
   DictionaryValue dialog_args;
   flow_->GetArgsForGaiaLogin(&dialog_args);
   EXPECT_EQ(4U, dialog_args.size());
   std::string actual_user;
   dialog_args.GetString("user", &actual_user);
   EXPECT_EQ(kTestUser, actual_user);
   int error = -1;
   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));
 }