Support Sync following Gaia OAuth authentication

chrome/browser/sync/sync_setup_wizard.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/sync_setup_wizard.h"
 
 #include <stddef.h>
 #include <ostream>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
+#include "chrome/browser/sync/util/oauth.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // If we just need to pop open an individual dialog, say to collect
 // gaia credentials in the event of a steady-state auth failure, this is
 // a "discrete" run (as in not a continuous wizard flow).  This returns
 // the end state to pass to Run for a given |start_state|.
 SyncSetupWizard::State GetEndStateForDiscreteRun(
@@ skipping 61 matching lines @@
   }
 }
 
 bool SyncSetupWizard::IsVisible() const {
   return flow_container_->get_flow() != NULL &&
          flow_container_->get_flow()->IsAttached();
 }
 
 // static
 SyncSetupWizard::State SyncSetupWizard::GetLoginState() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSyncOAuth))
-    return SyncSetupWizard::OAUTH_LOGIN;
-  return SyncSetupWizard::GAIA_LOGIN;
+  return browser_sync::IsUsingOAuth() ?
+      SyncSetupWizard::OAUTH_LOGIN :
+      SyncSetupWizard::GAIA_LOGIN;
 }
 
 void SyncSetupWizard::Focus() {
   SyncSetupFlow* flow = flow_container_->get_flow();
   if (flow)
     flow->Focus();
 }
 
 SyncSetupFlow* SyncSetupWizard::AttachSyncSetupHandler(
     SyncSetupFlowHandler* handler) {
   SyncSetupFlow* flow = flow_container_->get_flow();
   if (!flow || !flow->AttachSyncSetupHandler(handler))
     return NULL;
 
   return flow;
 }