Use embedded sign in UI for inline sign in flow

chrome/browser/ui/webui/inline_login_ui.cc

 // Copyright 2013 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/ui/webui/inline_login_ui.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 133 matching lines @@
       // the cookie jar of the embedded webview.
       std::string scope = net::EscapeUrlEncodedData(
           gaiaUrls->oauth1_login_scope(), true);
       std::string client_id = net::EscapeUrlEncodedData(
           gaiaUrls->oauth2_chrome_client_id(), true);
       std::string encoded_continue_params = base::StringPrintf(
           "?scope=%s&client_id=%s", scope.c_str(), client_id.c_str());
 
       const GURL& current_url = web_ui()->GetWebContents()->GetURL();
       signin::Source source = signin::GetSourceForPromoURL(current_url);
-      // TODO(guohui): switch to the embedded gaia endpoint for avatar flows
-      // when available.
       DCHECK(source != signin::SOURCE_UNKNOWN);
-      if (source != signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT &&
-          source != signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
-        params.SetString("service", "chromiumsync");
-        base::StringAppendF(
-            &encoded_continue_params, "&%s=%d", "source",
-            static_cast<int>(source));
+      if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
+          source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
+        // Drop the leading slash in the path.
+        params.SetString("gaiaPath",
+            gaiaUrls->embedded_signin_url().path().substr(1));
       }
 
+      params.SetString("service", "chromiumsync");
+      base::StringAppendF(
+          &encoded_continue_params, "&%s=%d", "source",
+          static_cast<int>(source));
+
       params.SetString("continueUrl",
           gaiaUrls->client_login_to_oauth2_url().Resolve(
               encoded_continue_params).spec());
 
       std::string email;
       net::GetValueForKeyInQuery(current_url, "Email", &email);
       if (!email.empty())
         params.SetString("email", email);
 
       partition_id_ =
@@ skipping 164 matching lines @@
   content::WebUIDataSource::Add(profile, CreateWebUIDataSource());
 
   web_ui->AddMessageHandler(new InlineLoginUIHandler(profile));
   // Required for intercepting extension function calls when the page is loaded
   // in a bubble (not a full tab, thus tab helpers are not registered
   // automatically).
   extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
 }
 
 InlineLoginUI::~InlineLoginUI() {}