Introduce disable-gaia-services for fake telemetry login.

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

Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
index c6a3fe826dc9f326f926a939d82984df110d9317..4e189b8fb3d9701110d1c327f25948639728b93b 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
@@ -40,10 +40,11 @@ OAuth2LoginManager::OAuth2LoginManager(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);
   }
 }