Initial refactoring complete

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 130 matching lines @@
   }
 
   RegisterAuthNotifications();
 
   // In Chrome, we integrate a SigninManager which works with the sync
   // setup wizard to kick off the TokenService. CrOS does its own plumbing
   // for the TokenService.
   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_);
   }
 
   if (!HasSyncSetupCompleted()) {
     DisableForUser();  // Clean up in case of previous crash / setup abort.
 
     // Under ChromeOS, just autostart it anyway if creds are here and start
     // is not being suppressed by preferences.
     if (!cros_user_.empty() &&
         !profile_->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart) &&
@@ skipping 623 matching lines @@
   last_attempted_user_email_ = username;
   is_auth_in_progress_ = true;
   NotifyObservers();
 
   auth_start_time_ = base::TimeTicks::Now();
 
   if (!signin_.get()) {
     // 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_);
   }
 
   if (!access_code.empty()) {
     signin_->ProvideSecondFactorAccessCode(access_code);
     return;
   }
 
   if (!signin_->GetUsername().empty()) {
     signin_->SignOut();
@@ skipping 453 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }