Upstream changes needed by Android auto-login.

chrome/browser/ui/auto_login_info_bar_delegate.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_info_bar_delegate.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 105 matching lines @@
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void AutoLoginRedirector::OnUbertokenFailure(
     const GoogleServiceAuthError& error) {
   LOG(WARNING) << "AutoLoginRedirector: token request failed";
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void AutoLoginRedirector::RedirectToMergeSession(const std::string& token) {
-  // The args are URL encoded, so we need to decode them before use.
-  std::string unescaped_args =
-      net::UnescapeURLComponent(args_, net::UnescapeRule::URL_SPECIAL_CHARS);
   // TODO(rogerta): what is the correct page transition?
   navigation_controller_->LoadURL(
       GURL(GaiaUrls::GetInstance()->merge_session_url() +
-          "?source=chrome&uberauth=" + token + "&" + unescaped_args),
+          "?source=chrome&uberauth=" + token + "&" + args_),
       content::Referrer(), content::PAGE_TRANSITION_AUTO_BOOKMARK,
       std::string());
 }
 
 }  // namepsace
 
 
 // AutoLoginInfoBarDelegate ---------------------------------------------------
 
 AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(
     InfoBarTabHelper* owner,
-    const std::string& username,
-    const std::string& args)
+    const std::string& realm,
+    const std::string& account,
+    const std::string& args,
+    const std::string& username)
     : ConfirmInfoBarDelegate(owner),
+      realm_(realm),
+      account_(account),
+      args_(args),
       username_(username),
-      args_(args),
       button_pressed_(false) {
   RecordHistogramAction(HISTOGRAM_SHOWN);
 }
 
 AutoLoginInfoBarDelegate::~AutoLoginInfoBarDelegate() {
   if (!button_pressed_)
     RecordHistogramAction(HISTOGRAM_IGNORED);
 }
 
+AutoLoginInfoBarDelegate*
+AutoLoginInfoBarDelegate::AsAutoLoginInfoBarDelegate() {

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

Nit: Indent 4

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

Done.

+  return this;
+}
+
 void AutoLoginInfoBarDelegate::InfoBarDismissed() {
   RecordHistogramAction(HISTOGRAM_DISMISSED);
   button_pressed_ = true;
 }
 
 gfx::Image* AutoLoginInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_AUTOLOGIN);
 }
 
 InfoBarDelegate::Type AutoLoginInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 string16 AutoLoginInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringFUTF16(IDS_AUTOLOGIN_INFOBAR_MESSAGE,
-                                    UTF8ToUTF16(username_));
+  return GetMessageText(username_);
 }
 
 string16 AutoLoginInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOLOGIN_INFOBAR_OK_BUTTON : IDS_AUTOLOGIN_INFOBAR_CANCEL_BUTTON);
 }
 
 bool AutoLoginInfoBarDelegate::Accept() {
   // AutoLoginRedirector deletes itself.
   new AutoLoginRedirector(&owner()->web_contents()->GetController(), args_);
   RecordHistogramAction(HISTOGRAM_ACCEPTED);
   button_pressed_ = true;
   return true;
 }
 
 bool AutoLoginInfoBarDelegate::Cancel() {
   PrefService* pref_service = TabContents::FromWebContents(
       owner()->web_contents())->profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kAutologinEnabled, false);
   RecordHistogramAction(HISTOGRAM_REJECTED);
   button_pressed_ = true;
   return true;
 }
 
+string16 AutoLoginInfoBarDelegate::GetMessageText(
+    const std::string& username) const {
+  return l10n_util::GetStringFUTF16(IDS_AUTOLOGIN_INFOBAR_MESSAGE,
+                                    UTF8ToUTF16(username));
+}
+
 void AutoLoginInfoBarDelegate::RecordHistogramAction(int action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Regular", action, HISTOGRAM_MAX);
 }