Merge 183575

chrome/browser/ui/sync/one_click_signin_helper.cc

Index: chrome/browser/ui/sync/one_click_signin_helper.cc
===================================================================
--- chrome/browser/ui/sync/one_click_signin_helper.cc	(revision 183689)
+++ chrome/browser/ui/sync/one_click_signin_helper.cc	(working copy)
@@ -886,7 +886,6 @@
                                     std::string());
 
   error_message_.clear();
-  signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::CleanTransientState() {
@@ -1102,6 +1101,7 @@
       if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
           source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
         signin_tracker_.reset(new SigninTracker(profile, this));
+        RedirectToNTP();
       }
       break;
     }
@@ -1169,8 +1169,9 @@
   }
 
   RedirectToNTP();
+  signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
-  RedirectToNTP();
+  signin_tracker_.reset();
 }