Assign unique partition ID to gaia webview

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"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 68 matching lines @@
   virtual void OnOAuth2TokensFetchFailed() OVERRIDE {
     LOG(ERROR) << "Failed to fetch oauth2 token with inline login.";
     web_ui_->CallJavascriptFunction("inline.login.handleOAuth2TokenFailure");
   }
 
  private:
   content::WebUI* web_ui_;
 };
 #endif // OS_CHROMEOS
 
+// Global SequenceNumber used for generating unique webview partition IDs.
+static base::StaticAtomicSequenceNumber next_partition_id;
+
 class InlineLoginUIHandler : public content::WebUIMessageHandler {
  public:
   explicit InlineLoginUIHandler(Profile* profile)
       : profile_(profile), weak_factory_(this), choose_what_to_sync_(false) {}
   virtual ~InlineLoginUIHandler() {}
 
   // content::WebUIMessageHandler overrides:
   virtual void RegisterMessages() OVERRIDE {
     web_ui()->RegisterMessageCallback("initialize",
         base::Bind(&InlineLoginUIHandler::HandleInitialize,
@@ skipping 53 matching lines @@
       }
 
       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_ =
+          "gaia-webview-" + base::IntToString(next_partition_id.GetNext());
+      params.SetString("partitionId", partition_id_);
     }
 #endif
 
     web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params);
   }
 
   // JS callback:
   void HandleInitialize(const base::ListValue* args) {
     LoadAuthExtension();
   }
@@ skipping 15 matching lines @@
       NOTREACHED();
       return;
     }
     dict->GetString("password", &password);
     dict->GetBoolean("chooseWhatToSync", &choose_what_to_sync_);
 
     content::WebContents* web_contents = web_ui()->GetWebContents();
     content::StoragePartition* partition =
         content::BrowserContext::GetStoragePartitionForSite(
             web_contents->GetBrowserContext(),
-            GURL("chrome-guest://mfffpogegjflfpflabcdkioaeobkgjik/?"));
+            GURL("chrome-guest://mfffpogegjflfpflabcdkioaeobkgjik/?" +
+                 partition_id_));

[lazyboy, 2013/11/04 21:08:29]

nit: generally query params have "query=value" form, so
"?partition=gaia-webview-1" is probably better? This might become an issue if we
need to add more query parameters to the GURL later.

[guohui, 2013/11/05 14:35:36]

i agree, but i thought currently ?partition_id is the required format for
webview guest site instance.
@fady, could you please confirm?

[Fady Samuel, 2013/11/05 21:47:08]

Yes, Hui is correct. See here: 

https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/br...

 
     scoped_refptr<SigninManagerCookieHelper> cookie_helper(
         new SigninManagerCookieHelper(partition->GetURLRequestContext()));
     cookie_helper->StartFetchingCookiesOnUIThread(
         GURL(GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
         base::Bind(&InlineLoginUIHandler::OnGaiaCookiesFetched,
                    weak_factory_.GetWeakPtr(), email, password));
 #endif
   }
 
@@ skipping 88 matching lines @@
           tab_strip_model->ExecuteContextMenuCommand(
               index, TabStripModel::CommandCloseTab);
         }
       }
     }
   }
 
   Profile* profile_;
   base::WeakPtrFactory<InlineLoginUIHandler> weak_factory_;
   bool choose_what_to_sync_;
+  // Partition id for the gaia webview;
+  std::string partition_id_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<chromeos::OAuth2TokenFetcher> oauth2_token_fetcher_;
   scoped_ptr<InlineLoginUIOAuth2Delegate> oauth2_delegate_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(InlineLoginUIHandler);
 };
 
 }  // namespace
 
 InlineLoginUI::InlineLoginUI(content::WebUI* web_ui)
     : WebDialogUI(web_ui),
       auth_extension_(Profile::FromWebUI(web_ui)) {
   Profile* profile = Profile::FromWebUI(web_ui);
   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() {}