Chrome OS OOBE: Remove the isNewGaiaFlow parameter

Remove the "isNewGaiaFlow" parameter from the cr.login.Authenticator's
load() method.

It seems that this parameter was always equal to |true| in the current
implementation.

Follow-up CLs will remove some other variables and code that becomes
dead after this CL.

Bug: 470893
Test: existing tests,
      manual test: checking that OOBE enrollment, OOBE login,
      adding a new user on Chrome OS and desktop platforms work

Change-Id: I4ee8da7e42564c24c758c97058685f1c4610a11b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605419Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Tien Mai <tienmai@chromium.org>
Commit-Queue: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659177}

chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

@@ -265,7 +265,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
       var gaiaParams = {};
       gaiaParams.gaiaUrl = data.gaiaUrl;
       gaiaParams.clientId = data.clientId;
-      gaiaParams.isNewGaiaFlow = true;
       gaiaParams.needPassword = false;
       gaiaParams.hl = data.hl;
       if (data.management_domain) {

chrome/browser/resources/chromeos/login/screen_gaia_signin.js

@@ -711,7 +711,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
           params[name] = data[name];
       }
 
-      params.isNewGaiaFlow = true;
       params.doSamlRedirect =
           (this.screenMode_ == ScreenMode.SAML_INTERSTITIAL);
       params.menuGuestMode = data.guestSignin;

chrome/browser/resources/gaia_auth_host/authenticator.js

@@ -21,7 +21,6 @@ cr.define('cr.login', function() {
   // of hardcoding the prod URL here.  As is, this does not work with staging
   // environments.
   const IDP_ORIGIN = 'https://accounts.google.com/';
-  const IDP_PATH = 'ServiceLogin?skipvpage=true&sarp=1&rm=hide';
   const CONTINUE_URL =
       'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html';
   const SIGN_IN_HEADER = 'google-accounts-signin';
@@ -292,7 +291,6 @@ cr.define('cr.login', function() {
           this.continueUrl_.substring(0, this.continueUrl_.indexOf('?')) ||
           this.continueUrl_;
       this.isConstrainedWindow_ = data.constrained == '1';
-      this.isNewGaiaFlow = data.isNewGaiaFlow;
       this.clientId_ = data.clientId;
       this.dontResizeNonEmbeddedPages = data.dontResizeNonEmbeddedPages;
 
@@ -306,11 +304,9 @@ cr.define('cr.login', function() {
           data.extractSamlPasswordAttributes;
       this.needPassword = !('needPassword' in data) || data.needPassword;
 
-      if (this.isNewGaiaFlow) {
-        this.webview_.contextMenus.onShow.addListener(function(e) {
-          e.preventDefault();
-        });
-      }
+      this.webview_.contextMenus.onShow.addListener(function(e) {
+        e.preventDefault();
+      });
 
       this.webview_.src = this.reloadUrl_;
       this.isLoaded_ = true;
@@ -346,60 +342,53 @@ cr.define('cr.login', function() {
       let url;
       if (data.gaiaPath) {
         url = this.idpOrigin_ + data.gaiaPath;
-      } else if (this.isNewGaiaFlow) {
-        url = this.constructChromeOSAPIUrl_();
       } else {
-        url = this.idpOrigin_ + IDP_PATH;
+        url = this.constructChromeOSAPIUrl_();
       }
 
-      if (this.isNewGaiaFlow) {
-        if (data.chromeType) {
-          url = appendParam(url, 'chrometype', data.chromeType);
-        }
-        if (data.clientId) {
-          url = appendParam(url, 'client_id', data.clientId);
-        }
-        if (data.enterpriseDisplayDomain) {
-          url = appendParam(url, 'manageddomain', data.enterpriseDisplayDomain);
-        }
-        if (data.clientVersion) {
-          url = appendParam(url, 'client_version', data.clientVersion);
-        }
-        if (data.platformVersion) {
-          url = appendParam(url, 'platform_version', data.platformVersion);
-        }
-        if (data.releaseChannel) {
-          url = appendParam(url, 'release_channel', data.releaseChannel);
-        }
-        if (data.endpointGen) {
-          url = appendParam(url, 'endpoint_gen', data.endpointGen);
-        }
-        let mi = '';
-        if (data.menuGuestMode) {
-          mi += 'gm,';
-        }
-        if (data.menuKeyboardOptions) {
-          mi += 'ko,';
-        }
-        if (data.menuEnterpriseEnrollment) {
-          mi += 'ee,';
-        }
-        if (mi.length) {
-          url = appendParam(url, 'mi', mi);
-        }
+      if (data.chromeType) {
+        url = appendParam(url, 'chrometype', data.chromeType);
+      }
+      if (data.clientId) {
+        url = appendParam(url, 'client_id', data.clientId);
+      }
+      if (data.enterpriseDisplayDomain) {
+        url = appendParam(url, 'manageddomain', data.enterpriseDisplayDomain);
+      }
+      if (data.clientVersion) {
+        url = appendParam(url, 'client_version', data.clientVersion);
+      }
+      if (data.platformVersion) {
+        url = appendParam(url, 'platform_version', data.platformVersion);
+      }
+      if (data.releaseChannel) {
+        url = appendParam(url, 'release_channel', data.releaseChannel);
+      }
+      if (data.endpointGen) {
+        url = appendParam(url, 'endpoint_gen', data.endpointGen);
+      }
+      let mi = '';
+      if (data.menuGuestMode) {
+        mi += 'gm,';
+      }
+      if (data.menuKeyboardOptions) {
+        mi += 'ko,';
+      }
+      if (data.menuEnterpriseEnrollment) {
+        mi += 'ee,';
+      }
+      if (mi.length) {
+        url = appendParam(url, 'mi', mi);
+      }
 
-        if (data.lsbReleaseBoard) {
-          url = appendParam(url, 'chromeos_board', data.lsbReleaseBoard);
-        }
-        if (data.isFirstUser) {
-          url = appendParam(url, 'is_first_user', true);
-        }
-        if (data.obfuscatedOwnerId) {
-          url = appendParam(url, 'obfuscated_owner_id', data.obfuscatedOwnerId);
-        }
-      } else {
-        url = appendParam(url, 'continue', this.continueUrl_);
-        url = appendParam(url, 'service', data.service || SERVICE_ID);
+      if (data.lsbReleaseBoard) {
+        url = appendParam(url, 'chromeos_board', data.lsbReleaseBoard);
+      }
+      if (data.isFirstUser) {
+        url = appendParam(url, 'is_first_user', true);
+      }
+      if (data.obfuscatedOwnerId) {
+        url = appendParam(url, 'obfuscated_owner_id', data.obfuscatedOwnerId);
       }
       if (data.hl) {
         url = appendParam(url, 'hl', data.hl);
@@ -448,16 +437,6 @@ cr.define('cr.login', function() {
     onRequestCompleted_(details) {
       const currentUrl = details.url;
 
-      if (!this.isNewGaiaFlow &&
-          currentUrl.lastIndexOf(this.continueUrlWithoutParams_, 0) == 0) {
-        if (currentUrl.indexOf('ntp=1') >= 0) {
-          this.skipForNow_ = true;
-        }
-
-        this.maybeCompleteAuth_();
-        return;
-      }
-
       if (!currentUrl.startsWith('https')) {
         this.trusted_ = false;
       }

chrome/browser/ui/webui/signin/inline_login_handler_chromeos.cc

@@ -116,7 +116,6 @@ void InlineLoginHandlerChromeOS::RegisterMessages() {
 void InlineLoginHandlerChromeOS::SetExtraInitParams(
     base::DictionaryValue& params) {
   const GaiaUrls* const gaia_urls = GaiaUrls::GetInstance();
-  params.SetKey("isNewGaiaFlow", base::Value(true));
   params.SetKey("clientId", base::Value(gaia_urls->oauth2_chrome_client_id()));
 
   const GURL& url = gaia_urls->embedded_setup_chromeos_url(2U);

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

@@ -503,7 +503,6 @@ void InlineLoginHandlerImpl::SetExtraInitParams(base::DictionaryValue& params) {
   HandlerSigninReason reason = GetHandlerSigninReason(current_url);
 
   const GURL& url = GaiaUrls::GetInstance()->embedded_signin_url();
-  params.SetBoolean("isNewGaiaFlow", true);
   params.SetString("clientId",
                    GaiaUrls::GetInstance()->oauth2_chrome_client_id());
   params.SetString("gaiaPath", url.path().substr(1));