Introduce disable-gaia-services for fake telemetry login.

chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

 // Copyright 2014 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/chromeos/login/signin/oauth2_login_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
     "https://www.googleapis.com/auth/userinfo.email";
 static const int kMaxRetries = 5;
 
 }  // namespace
 
 OAuth2LoginManager::OAuth2LoginManager(Profile* user_profile)
     : user_profile_(user_profile),
       restore_strategy_(RESTORE_FROM_COOKIE_JAR),
       state_(SESSION_RESTORE_NOT_STARTED) {
   GetTokenService()->AddObserver(this);
+
+  // For telemetry, we mark session restore completed to avoid warnings from
+  // MergeSessionThrottle.
   if (CommandLine::ForCurrentProcess()->
-          HasSwitch(chromeos::switches::kOobeSkipPostLogin)) {
-    // For telemetry we should mark session restore completed to avoid
-    // warnings from MergeSessionThrottle.
+          HasSwitch(chromeos::switches::kDisableGaiaServices)) {
     SetSessionRestoreState(SESSION_RESTORE_DONE);
   }
 }
 
 OAuth2LoginManager::~OAuth2LoginManager() {
 }
 
 void OAuth2LoginManager::AddObserver(OAuth2LoginManager::Observer* observer) {
   observer_list_.AddObserver(observer);
 }
@@ skipping 337 matching lines @@
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSessionRestoreStateChanged(user_profile_, state_));
 }
 
 void OAuth2LoginManager::SetSessionRestoreStartForTesting(
     const base::Time& time) {
   session_restore_start_ = time;
 }
 
 }  // namespace chromeos