Upstream changes needed by Android auto-login.

chrome/browser/ui/auto_login_prompter.cc

 // Copyright (c) 2012 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/auto_login_prompter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_split.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::WebContents;
 
+namespace {
+
+bool FetchUsername(Profile* profile, std::string* output) {
+  // In an incognito window, there may not be a profile sync service and/or
+  // signin manager.
+  if (!ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService(
+      profile)) {
+    return false;
+  }
+
+  if (!TokenServiceFactory::GetForProfile(profile)->AreCredentialsValid())
+    return false;
+
+  SigninManager* signin_manager =
+      SigninManagerFactory::GetInstance()->GetForProfile(profile);
+  if (!signin_manager)
+    return false;
+
+  *output = signin_manager->GetAuthenticatedUsername();
+  return true;
+}
+
+}  // namespace
+
+AutoLoginPrompter::Params::Params() {}
+AutoLoginPrompter::Params::~Params() {}
+
 AutoLoginPrompter::AutoLoginPrompter(
     WebContents* web_contents,
-    const std::string& username,
-    const std::string& args)
+    const Params& params)
     : web_contents_(web_contents),
-      username_(username),
-      args_(args) {
+      params_(params) {
   registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                  content::Source<NavigationController>(
                     &web_contents_->GetController()));
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::Source<WebContents>(web_contents_));
 }
 
 AutoLoginPrompter::~AutoLoginPrompter() {
 }
 
 // static
 void AutoLoginPrompter::ShowInfoBarIfPossible(net::URLRequest* request,
                                               int child_id,
                                               int route_id) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin))
       return;
 
   // See if the response contains the X-Auto-Login header.  If so, this was
   // a request for a login page, and the server is allowing the browser to
   // suggest auto-login, if available.
   std::string value;
   request->GetResponseHeaderByName("X-Auto-Login", &value);
-  if (value.empty())
-    return;
-
-  std::vector<std::pair<std::string, std::string> > pairs;
-  if (!base::SplitStringIntoKeyValuePairs(value, '=', '&', &pairs))
-    return;
-
-  // Parse the information from the value string.
-  std::string realm;
-  std::string account;
-  std::string args;
-  for (size_t i = 0; i < pairs.size(); ++i) {
-    const std::pair<std::string, std::string>& pair = pairs[i];
-    if (pair.first == "realm") {
-      realm = net::UnescapeURLComponent(pair.second,
-                                        net::UnescapeRule::URL_SPECIAL_CHARS);
-    } else if (pair.first == "account") {
-      account = net::UnescapeURLComponent(pair.second,
-                                          net::UnescapeRule::URL_SPECIAL_CHARS);
-    } else if (pair.first == "args") {
-      args = pair.second;
-    }
-  }
-
-  // Currently we only accept GAIA credentials.
-  if (realm != "com.google")
+  Params params;
+  if (!ParseAutoLoginHeader(value, &params))
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&AutoLoginPrompter::ShowInfoBarUIThread, account, args,
-                 request->url(), child_id, route_id));
+      base::Bind(&ShowInfoBarUIThread,
+                 params, request->url(), child_id, route_id));
 }
 
 // static
-void AutoLoginPrompter::ShowInfoBarUIThread(const std::string& account,
-                                            const std::string& args,
+void AutoLoginPrompter::ShowInfoBarUIThread(const Params& params,
                                             const GURL& url,
                                             int child_id,
                                             int route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   WebContents* web_contents = tab_util::GetWebContentsByID(child_id, route_id);
   if (!web_contents)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   if (!profile->GetPrefs()->GetBoolean(prefs::kAutologinEnabled))
     return;
 
-  // In an incognito window, there may not be a profile sync service and/or
-  // signin manager.
-  if (!ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService(
-      profile)) {
+  Params params_copy(params);

[Peter Kasting, 2012/06/27 17:39:05]

Nit: Why not pass this in by value?

[Philippe, 2012/06/28 09:24:00]

Done.

+#if !defined(OS_ANDROID)
+  // On Android, the username is fetched later from the AccountManager on the

[Peter Kasting, 2012/06/27 17:39:05]

Nit: What does "later" mean?  This function must be called twice on Android? 
This function must be called before Android then does something different to
create the infobar that doesn't use this function at all?

[Philippe, 2012/06/28 09:24:00]

I removed 'later' and made the comment clearer (I think).

We do use this function. We just fetch the username ourselves and pass it to the
newly added GetMessageText function which takes a username in rather than
directly using |username_|.

+  // Java side.
+  if (!FetchUsername(profile, &params_copy.username))
     return;
-  }
-
-  if (!TokenServiceFactory::GetForProfile(profile)->AreCredentialsValid())
-    return;
-
-  SigninManager* signin_manager =
-      SigninManagerFactory::GetInstance()->GetForProfile(profile);
-  if (!signin_manager)
-    return;
-
-  const std::string& username = signin_manager->GetAuthenticatedUsername();
+#endif
 
   // Make sure that |account|, if specified, matches the logged in user.
   // However, |account| is usually empty.
-  if (!account.empty() && (username != account))
+  if (!params.username.empty() && !params.account.empty() &&
+      params_copy.username != params.account) {

[Peter Kasting, 2012/06/27 17:39:05]

Nit: {} not needed

[Philippe, 2012/06/28 09:24:00]

Done.

     return;
-
+  }
   // We can't add the infobar just yet, since we need to wait for the tab to
   // finish loading.  If we don't, the info bar appears and then disappears
   // immediately.  Create an AutoLoginPrompter instance to listen for the
   // relevant notifications; it will delete itself.
-  new AutoLoginPrompter(web_contents, username, args);
+  new AutoLoginPrompter(web_contents, params_copy);
 }
 
 void AutoLoginPrompter::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_LOAD_STOP) {
     TabContents* tab_contents = TabContents::FromWebContents(web_contents_);
     // |tab_contents| is NULL for WebContents hosted in WebDialog.
     if (tab_contents) {
       InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
-      infobar_helper->AddInfoBar(new AutoLoginInfoBarDelegate(infobar_helper,
-                                                              username_,
-                                                              args_));
+      infobar_helper->AddInfoBar(new AutoLoginInfoBarDelegate(
+          infobar_helper,

[Peter Kasting, 2012/06/27 17:39:05]

Nit: Strange wrapping.  Put more args on this line.

[Philippe, 2012/06/28 09:24:00]

Done.

+          params_.realm, params_.account, params_.args, params_.username));
     }
   }
   // Either we couldn't add the infobar, we added the infobar, or the tab
   // contents was destroyed before the navigation completed.  In any case
   // there's no reason to live further.
   delete this;
 }
+
+// static
+bool AutoLoginPrompter::ParseAutoLoginHeader(const std::string& input,
+                                             Params* output) {
+  // TODO(pliard): Investigate/fix potential internationalization issue. It
+  // seems that "account" from the x-auto-login header might contain non-ASCII
+  // characters.
+  if (input.empty())
+    return false;
+
+  std::vector<std::pair<std::string, std::string> > pairs;
+  if (!base::SplitStringIntoKeyValuePairs(input, '=', '&', &pairs))
+    return false;
+
+  // Parse the information from the |input| string.
+  Params params;
+  for (size_t i = 0; i < pairs.size(); ++i) {
+    const std::pair<std::string, std::string>& pair = pairs[i];
+    if (pair.first == "realm") {
+      params.realm = net::UnescapeURLComponent(
+          pair.second, net::UnescapeRule::URL_SPECIAL_CHARS);
+      // Currently we only accept GAIA credentials.
+      if (params.realm != "com.google")
+        return false;
+    } else if (pair.first == "account") {
+      params.account = net::UnescapeURLComponent(
+          pair.second, net::UnescapeRule::URL_SPECIAL_CHARS);
+    } else if (pair.first == "args") {
+      params.args = net::UnescapeURLComponent(
+          pair.second, net::UnescapeRule::URL_SPECIAL_CHARS);
+    }
+  }
+  if (params.realm.empty() || params.args.empty())
+    return false;
+
+  *output = params;
+  return true;
+}