Properly handle user cancellation of signin.

chrome/browser/ui/sync/one_click_signin_helper.cc

Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 085a8a74ea1598f67fef482fe96a7bd659ac634b..62ba97755dd87a003701a1000c8fb75c5e0ec8b3 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -1333,6 +1333,7 @@ void OneClickSigninHelper::SigninFailed(const GoogleServiceAuthError& error) {
   if (error_message_.empty() && !error.error_message().empty())
       error_message_ = error.error_message();
 
+  bool display_bubble = true;
   if (error_message_.empty()) {
     switch (error.state()) {
       case GoogleServiceAuthError::NONE:
@@ -1341,20 +1342,26 @@ void OneClickSigninHelper::SigninFailed(const GoogleServiceAuthError& error) {
       case GoogleServiceAuthError::SERVICE_UNAVAILABLE:
         error_message_ = l10n_util::GetStringUTF8(IDS_SYNC_UNRECOVERABLE_ERROR);
         break;
+      case GoogleServiceAuthError::REQUEST_CANCELED:
+        // If the user cancelled signin, then no need to display any error
+        // messages or anything - just go back to the NTP.
+        error_message_.clear();
+        display_bubble = false;
+        break;
       default:
         error_message_ = l10n_util::GetStringUTF8(IDS_SYNC_ERROR_SIGNING_IN);
         break;
     }
   }
-  RedirectOnSigninComplete();
+  RedirectOnSigninComplete(display_bubble);
 }
 
 void OneClickSigninHelper::SigninSuccess() {
-  RedirectOnSigninComplete();
+  RedirectOnSigninComplete(true);
 }
 
-void OneClickSigninHelper::RedirectOnSigninComplete() {
-  // Show the result in the sign-in bubble.
-  RedirectToNtpOrAppsPage(true);
+void OneClickSigninHelper::RedirectOnSigninComplete(bool show_bubble) {
+  // Show the result in the sign-in bubble if desired.
+  RedirectToNtpOrAppsPage(show_bubble);
   signin_tracker_.reset();
 }