Revert of Implement inline signin with iframe

chrome/browser/ui/webui/signin/inline_login_handler_impl.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/signin/inline_login_handler_impl.h"
 
+#include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_oauth_helper.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 
 namespace {
 
+// Global SequenceNumber used for generating unique webview partition IDs.
+base::StaticAtomicSequenceNumber next_partition_id;
+
 } // empty namespace
 
 InlineLoginHandlerImpl::InlineLoginHandlerImpl()
-      : weak_factory_(this), choose_what_to_sync_(false) {
+      : weak_factory_(this), choose_what_to_sync_(false), partition_id_("") {
 }
 
 InlineLoginHandlerImpl::~InlineLoginHandlerImpl() {}
 
 void InlineLoginHandlerImpl::RegisterMessages() {
   InlineLoginHandler::RegisterMessages();
 
   web_ui()->RegisterMessageCallback("switchToFullTab",
       base::Bind(&InlineLoginHandlerImpl::HandleSwitchToFullTabMessage,
                   base::Unretained(this)));
 }
 
 void InlineLoginHandlerImpl::SetExtraInitParams(base::DictionaryValue& params) {
-  params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode);
+  params.SetInteger("authMode", InlineLoginHandler::kInlineAuthMode);
 
   const GURL& current_url = web_ui()->GetWebContents()->GetURL();
   signin::Source source = signin::GetSourceForPromoURL(current_url);
   DCHECK(source != signin::SOURCE_UNKNOWN);
   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::GetInstance()->embedded_signin_url().path().substr(1));
   }
@@ skipping 21 matching lines @@
   std::string is_constrained;
   net::GetValueForKeyInQuery(current_url, "constrained", &is_constrained);
   if (!is_constrained.empty())
     params.SetString("constrained", is_constrained);
 
   // TODO(rogerta): this needs to be passed on to gaia somehow.
   std::string read_only_email;
   net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email);
   if (!read_only_email.empty())
     params.SetString("readOnlyEmail", read_only_email);
+
+  net::GetValueForKeyInQuery(current_url, "partitionId", &partition_id_);
+  if (partition_id_.empty()) {
+    partition_id_ =
+        "gaia-webview-" + base::IntToString(next_partition_id.GetNext());
+  }
+  params.SetString("partitionId", partition_id_);
 }
 
 
 void InlineLoginHandlerImpl::HandleSwitchToFullTabMessage(
     const base::ListValue* args) {
   base::string16 url_str;
   CHECK(args->GetString(0, &url_str));
 
   content::WebContents* web_contents = web_ui()->GetWebContents();
   GURL main_frame_url(web_contents->GetURL());
   main_frame_url = net::AppendOrReplaceQueryParameter(
       main_frame_url, "frameUrl", UTF16ToASCII(url_str));
+  main_frame_url = net::AppendOrReplaceQueryParameter(
+      main_frame_url, "partitionId", partition_id_);
   chrome::NavigateParams params(
       Profile::FromWebUI(web_ui()),
       net::AppendOrReplaceQueryParameter(main_frame_url, "constrained", "0"),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   chrome::Navigate(&params);
 
   web_ui()->CallJavascriptFunction("inline.login.closeDialog");
 }
 
 void InlineLoginHandlerImpl::CompleteLogin(const base::ListValue* args) {
-  DCHECK(email_.empty() && password_.empty() && session_index_.empty());
+  DCHECK(email_.empty() && password_.empty());
 
   content::WebContents* contents = web_ui()->GetWebContents();
   const GURL& current_url = contents->GetURL();
 
   const base::DictionaryValue* dict = NULL;
   base::string16 email;
   if (!args->GetDictionary(0, &dict) || !dict ||
       !dict->GetString("email", &email)) {
     // User cancelled the signin by clicking 'skip for now'.
     bool skip_for_now = false;
@@ skipping 18 matching lines @@
   if (net::GetValueForKeyInQuery(current_url, "email", &default_email) &&
       net::GetValueForKeyInQuery(current_url, "validateEmail",
                                  &validate_email) &&
       validate_email == "1") {
     if (email_ != default_email) {
       SyncStarterCallback(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
       return;
     }
   }
 
-  base::string16 session_index;
-  dict->GetString("sessionIndex", &session_index);
-  session_index_ = UTF16ToASCII(session_index);
-  DCHECK(!session_index_.empty());
   dict->GetBoolean("chooseWhatToSync", &choose_what_to_sync_);
 
   signin::Source source = signin::GetSourceForPromoURL(current_url);
   OneClickSigninHelper::CanOfferFor can_offer =
       source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ?
       OneClickSigninHelper::CAN_OFFER_FOR_SECONDARY_ACCOUNT :
       OneClickSigninHelper::CAN_OFFER_FOR_ALL;
   std::string error_msg;
   OneClickSigninHelper::CanOffer(
       contents, can_offer, email_, &error_msg);
   if (!error_msg.empty()) {
     HandleLoginError(error_msg);
     return;
   }
 
   content::StoragePartition* partition =
       content::BrowserContext::GetStoragePartitionForSite(
           contents->GetBrowserContext(),
-          GURL(chrome::kChromeUIChromeSigninURL));
+          GURL("chrome-guest://mfffpogegjflfpflabcdkioaeobkgjik/?" +
+                partition_id_));
 
   auth_fetcher_.reset(new GaiaAuthFetcher(this,
                                           GaiaConstants::kChromeSource,
                                           partition->GetURLRequestContext()));
-  auth_fetcher_->StartCookieForOAuthCodeExchange(session_index_);
+  auth_fetcher_->StartCookieForOAuthCodeExchange("0");
 }
 
 void InlineLoginHandlerImpl::OnClientOAuthCodeSuccess(
     const std::string& oauth_code) {
   DCHECK(!oauth_code.empty());
 
   content::WebContents* contents = web_ui()->GetWebContents();
   Profile* profile = Profile::FromWebUI(web_ui());
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
@@ skipping 46 matching lines @@
             email_, password_, oauth_code,
             start_mode,
             contents,
             confirmation_required,
             sync_callback);
       }
   }
 
   email_.clear();
   password_.clear();
-  session_index_.clear();
   web_ui()->CallJavascriptFunction("inline.login.closeDialog");
 }
 
 void InlineLoginHandlerImpl::OnClientOAuthCodeFailure(
     const GoogleServiceAuthError& error) {
   LOG(ERROR) << "InlineLoginUI::OnClientOAuthCodeFailure";
   HandleLoginError(error.ToString());
 }
 
 void InlineLoginHandlerImpl::HandleLoginError(const std::string& error_msg) {
   SyncStarterCallback(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
 
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   if (!browser) {
     browser = chrome::FindLastActiveWithProfile(
         Profile::FromWebUI(web_ui()), chrome::GetActiveDesktop());
   }
   if (browser)
     OneClickSigninHelper::ShowSigninErrorBubble(browser, error_msg);
 
   email_.clear();
   password_.clear();
-  session_index_.clear();
 }
 
 void InlineLoginHandlerImpl::SyncStarterCallback(
     OneClickSigninSyncStarter::SyncSetupResult result) {
   content::WebContents* contents = web_ui()->GetWebContents();
   const GURL& current_url = contents->GetURL();
   bool auto_close = signin::IsAutoCloseEnabledInURL(current_url);
   if (auto_close) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
@@ skipping 13 matching lines @@
     TabStripModel* tab_strip_model = browser->tab_strip_model();
     if (tab_strip_model) {
       int index = tab_strip_model->GetIndexOfWebContents(tab);
       if (index != TabStripModel::kNoTab) {
         tab_strip_model->ExecuteContextMenuCommand(
             index, TabStripModel::CommandCloseTab);
       }
     }
   }
 }