Initial refactoring complete

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index dde2a0eca9da41a50c1dd3877979a7a53c8aa9ac..a3b4c0f4da0f81aaa10d20ea75c9a70288af8ea1 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -148,7 +148,13 @@ void ProfileSyncService::Initialize() {
   if (cros_user_.empty()) {
     // Will load tokens from DB and broadcast Token events after.
     // Note: We rely on signin_ != NULL unless !cros_user_.empty().
-    signin_.reset(new SigninManager());
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableSyncOAuth)) {
+      signin_.reset(SigninManager::CreateSigninManager(
+                        SigninManager::kOAuthVariant));
+    } else {
+      signin_.reset(SigninManager::CreateSigninManager());
+    }
     signin_->Initialize(profile_);
   }
 
@@ -792,7 +798,13 @@ void ProfileSyncService::OnUserSubmittedAuth(
     // In ChromeOS we sign in during login, so we do not instantiate signin_.
     // If this function gets called, we need to re-authenticate (e.g. for
     // two factor signin), so instantiante signin_ here.
-    signin_.reset(new SigninManager());
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableSyncOAuth)) {
+      signin_.reset(SigninManager::CreateSigninManager(
+                        SigninManager::kOAuthVariant));
+    } else {
+      signin_.reset(SigninManager::CreateSigninManager());
+    }
     signin_->Initialize(profile_);
   }