Upstream changes needed by Android auto-login.

chrome/browser/ui/auto_login_prompter.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_
 #define CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_
 
 #include <string>
+
 #include "base/compiler_specific.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class GURL;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class URLRequest;
 }
 
 // This class displays an infobar that allows the user to automatically login to
 // the currently loaded page with one click.  This is used when the browser
 // detects that the user has navigated to a login page and that there are stored
 // tokens that would allow a one-click login.
 class AutoLoginPrompter : public content::NotificationObserver {
  public:
   // Looks for the X-Auto-Login response header in the request, and if found,
   // tries to display an infobar in the tab contents identified by the
   // child/route id.
   static void ShowInfoBarIfPossible(net::URLRequest* request,
                                     int child_id,
                                     int route_id);
 
  private:
+  friend class AutoLoginPrompterTest;
+
+  struct Params {
+    Params();
+    ~Params();
+
+    // Extracted from X-Auto-Login header.
+    std::string realm;
+    std::string account;
+    std::string args;
+    // Fetched through sync on non-Android platforms.
+    std::string username;
+  };
+
   AutoLoginPrompter(content::WebContents* web_contents,
-                    const std::string& username,
-                    const std::string& args);
+                    const Params& params);
 
   virtual ~AutoLoginPrompter();
 
-  // The portion of ShowInfoBarIfPossible() that needs to run on the UI thread.
-  static void ShowInfoBarUIThread(const std::string& account,
-                                  const std::string& args,
-                                  const GURL& original_url,
+  static void ShowInfoBarUIThread(Params params,

[Roger Tawa OOO till Jul 10th, 2012/06/28 14:39:56]

const ref params?

[Philippe, 2012/06/28 15:18:27]

That's what we had a few patch sets ago :) Peter suggested that I take |params|
by copy since I was making a copy in the method's body anyway.

[Roger Tawa OOO till Jul 10th, 2012/06/28 15:31:51]

OK sorry, I didn't see Peter's comment.  It just seemed weird with the const
GURL& right below it.

+                                  const GURL& url,
                                   int child_id,
                                   int route_id);
 
   // content::NotificationObserver override.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Returns whether parsing succeeded.
+  static bool ParseAutoLoginHeader(const std::string& input, Params* output);
+
   content::WebContents* web_contents_;
-  const std::string username_;
-  const std::string args_;
+  const Params params_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginPrompter);
 };
 
 #endif  // CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_