Reland r242290, r241609, r242134.

chrome/browser/ui/sync/one_click_signin_helper.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_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 105 matching lines @@
                                   ProfileIOData* io_data);
 
   // Looks for the Google-Accounts-SignIn response header, and if found,
   // tries to display an infobar in the tab contents identified by the
   // child/route id.
   static void ShowInfoBarIfPossible(net::URLRequest* request,
                                     ProfileIOData* io_data,
                                     int child_id,
                                     int route_id);
 
+  // Handles cross account sign in error. If the supplied |email| does not match
+  // the last signed in email of the current profile, then Chrome will show a
+  // confirmation dialog before starting sync. It returns true if there is a
+  // cross ccount error, and false otherwise.
+  static bool HandleCrossAccountError(
+      content::WebContents* contents,
+      const std::string& session_index,
+      const std::string& email,
+      const std::string& password,
+      const std::string& oauth_code,
+      OneClickSigninHelper::AutoAccept auto_accept,
+      signin::Source source,
+      OneClickSigninSyncStarter::StartSyncMode start_mode,
+      OneClickSigninSyncStarter::Callback sync_callback);
+
   // If the |source| is not settings page/webstore, redirects to
   // the NTP/Apps page.
   static void RedirectToNtpOrAppsPageIfNecessary(
       content::WebContents* contents, signin::Source source);
 
   static void ShowSigninErrorBubble(Browser* browser, const std::string& error);
 
   // Remove the item currently at the top of the history list if it's
   // the Gaia redirect URL. Due to limitations of the NavigationController
   // this cannot be done until a new page becomes "current".
@@ skipping 18 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
                            RemoveObserverFromProfileSyncService);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, CanOfferOnIOThread);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadIncognito);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadNoIOData);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadBadURL);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
-                           CanOfferOnIOThreadReferrer);
-  FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadDisabled);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadSignedIn);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadEmailNotAllowed);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CanOfferOnIOThreadEmailAlreadyUsed);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
                            CreateTestProfileIOData);
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest,
@@ skipping 11 matching lines @@
   OneClickSigninHelper(content::WebContents* web_contents,
                        PasswordManager* password_manager);
 
   virtual ~OneClickSigninHelper();
 
   // Returns true if the one-click signin feature can be offered at this time.
   // It can be offered if the io_data is not in an incognito window and if the
   // origin of |url| is a valid Gaia sign in origin.  This function is meant
   // to called only from the IO thread.
   static Offer CanOfferOnIOThreadImpl(const GURL& url,
-                                      const std::string& referrer,
                                       base::SupportsUserData* request,
                                       ProfileIOData* io_data);
 
   // The portion of ShowInfoBarIfPossible() that needs to run on the UI thread.
   // |session_index| and |email| are extracted from the Google-Accounts-SignIn
   // header.  |auto_accept| is extracted from the Google-Chrome-SignIn header.
   // |source| is used to determine which of the explicit sign in mechanism is
   // being used.
   //
   // |continue_url| is where Gaia will continue to when the sign in process is
@@ skipping 82 matching lines @@
 
   // Allows unittest to avoid starting sync for real.
   bool do_not_start_sync_for_testing_;
 
   base::WeakPtrFactory<OneClickSigninHelper> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_