Revert 179302

chrome/browser/ui/sync/one_click_signin_helper.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/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 65 matching lines @@
 // sign-in, for this profile.
 void AddEmailToOneClickRejectedList(Profile* profile,
                                     const std::string& email) {
   PrefService* pref_service = profile->GetPrefs();
   ListPrefUpdate updater(pref_service,
                          prefs::kReverseAutologinRejectedEmailList);
   updater->AppendIfNotPresent(new base::StringValue(email));
 }
 
 // Start syncing with the given user information.
-void StartSync(Profile* profile,
-               Browser* browser,
+void StartSync(Browser* browser,
                OneClickSigninHelper::AutoAccept auto_accept,
                const std::string& session_index,
                const std::string& email,
                const std::string& password,
                OneClickSigninSyncStarter::StartSyncMode start_mode) {
   // The starter deletes itself once its done.
-  new OneClickSigninSyncStarter(profile, browser, session_index, email,
-                                password, start_mode);
+  new OneClickSigninSyncStarter(browser, session_index, email, password,
+                                start_mode);
 
   int action = one_click_signin::HISTOGRAM_MAX;
   switch (auto_accept) {
     case OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT:
       action = one_click_signin::HISTOGRAM_AUTO_WITH_DEFAULTS;
       break;
     case OneClickSigninHelper::AUTO_ACCEPT_ACCEPTED:
       action =
           start_mode == OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS ?
               one_click_signin::HISTOGRAM_AUTO_WITH_DEFAULTS :
@@ skipping 197 matching lines @@
   Profile* profile = Profile::FromBrowserContext(
       web_contents->GetBrowserContext());
 
   // User has accepted one-click sign-in for this account. Never ask again for
   // this profile.
   SigninManager::DisableOneClickSignIn(profile);
   RecordHistogramAction(one_click_signin::HISTOGRAM_ACCEPTED);
   chrome::FindBrowserWithWebContents(web_contents)->window()->
       ShowOneClickSigninBubble(
           BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
-          base::Bind(&StartSync, profile, browser,
+          base::Bind(&StartSync, browser,
                      OneClickSigninHelper::AUTO_ACCEPT_NONE, session_index_,
                      email_, password_));
   button_pressed_ = true;
   return true;
 }
 
 bool OneClickInfoBarDelegateImpl::Cancel() {
   AddEmailToOneClickRejectedList(Profile::FromBrowserContext(
       owner()->GetWebContents()->GetBrowserContext()), email_);
   RecordHistogramAction(one_click_signin::HISTOGRAM_REJECTED);
@@ skipping 535 matching lines @@
       } else {
         OneClickInfoBarDelegateImpl::Create(
             InfoBarService::FromWebContents(contents), session_index_, email_,
             password_);
       }
       break;
     case AUTO_ACCEPT_ACCEPTED:
       SigninManager::DisableOneClickSignIn(profile);
       browser->window()->ShowOneClickSigninBubble(
           BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG,
-          base::Bind(&StartSync, profile, browser, auto_accept_, session_index_,
+          base::Bind(&StartSync, browser, auto_accept_, session_index_,
                      email_, password_));
       break;
     case AUTO_ACCEPT_CONFIGURE:
       SigninManager::DisableOneClickSignIn(profile);
-      StartSync(profile, browser, auto_accept_, session_index_, email_,
-                password_, OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
+      StartSync(browser, auto_accept_, session_index_, email_, password_,
+                OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
       break;
     case AUTO_ACCEPT_EXPLICIT:
-      StartSync(profile, browser, auto_accept_, session_index_, email_,
-                password_, source_ == SyncPromoUI::SOURCE_SETTINGS ?
+      StartSync(browser, auto_accept_, session_index_, email_, password_,
+                source_ == SyncPromoUI::SOURCE_SETTINGS ?
                     OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST :
                     OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
 
       // If this was a last minute switch to the settings page, this means the
       // started with first-run/NTP/wrench menu, and checked the "configure
       // first" checkbox.  Replace the default blank continue page with an
       // about:blank page, so that when the settings page is displayed, it
       // reuses the tab.
       if (last_minute_source_change) {
         contents->GetController().LoadURL(
@@ skipping 43 matching lines @@
         break;
     }
   }
 
   RedirectToNTP();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   RedirectToNTP();
 }