Implement new password separated sign in flow for chrome.

This is currently behind a flag to allow chrome and GAIA UX folks to play
with the feature.

BUG=533004

Review URL: https://codereview.chromium.org/1344443002

Cr-Commit-Position: refs/heads/master@{#352598}

2 files changed, 10 insertions, 1 deletions

diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index dae39b2..cb009d9 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -32,7 +32,8 @@ const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge";
 const char kOAuth1LoginUrlSuffix[] = "OAuthLogin";
 const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken";
 const char kListAccountsSuffix[] = "ListAccounts?json=standard";
-const char kEmbeddedSigninSuffix[] = "EmbeddedSignIn";
+const char kPasswordCombinedEmbeddedSigninSuffix[] = "EmbeddedSignIn";
+const char kEmbeddedSigninSuffix[] = "embedded/setup/chrome/usermenu";
 const char kAddAccountSuffix[] = "AddSession";
 const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo";
 
@@ -111,6 +112,8 @@ GaiaUrls::GaiaUrls() {
   oauth_revoke_token_url_ = gaia_url_.Resolve(kOAuthRevokeTokenUrlSuffix);
   oauth1_login_url_ = gaia_url_.Resolve(kOAuth1LoginUrlSuffix);
   list_accounts_url_ = gaia_url_.Resolve(kListAccountsSuffix);
+  password_combined_embedded_signin_url_ =
+      gaia_url_.Resolve(kPasswordCombinedEmbeddedSigninSuffix);
   embedded_signin_url_ = gaia_url_.Resolve(kEmbeddedSigninSuffix);
   add_account_url_ = gaia_url_.Resolve(kAddAccountSuffix);
   get_check_connection_info_url_ =
@@ -221,6 +224,10 @@ const GURL& GaiaUrls::embedded_signin_url() const {
   return embedded_signin_url_;
 }
 
+const GURL& GaiaUrls::password_combined_embedded_signin_url() const {
+  return password_combined_embedded_signin_url_;
+}
+
 const GURL& GaiaUrls::add_account_url() const {
   return add_account_url_;
 }
diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h
index b67b177..935aa82 100644
--- a/google_apis/gaia/gaia_urls.h
+++ b/google_apis/gaia/gaia_urls.h
@@ -34,6 +34,7 @@ class GaiaUrls {
   const GURL& oauth_user_info_url() const;
   const GURL& oauth_revoke_token_url() const;
   const GURL& oauth1_login_url() const;
+  const GURL& password_combined_embedded_signin_url() const;
   const GURL& embedded_signin_url() const;
   const GURL& add_account_url() const;
 
@@ -85,6 +86,7 @@ class GaiaUrls {
   GURL oauth_revoke_token_url_;
   GURL oauth1_login_url_;
   GURL list_accounts_url_;
+  GURL password_combined_embedded_signin_url_;
   GURL embedded_signin_url_;
   GURL add_account_url_;
   GURL get_check_connection_info_url_;