Properly handle user cancellation of signin.

chrome/browser/ui/sync/one_click_signin_helper_unittest.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 "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ skipping 198 matching lines @@
   // Set the ID of the signin process that the test will assume to be the
   // only process allowed to sign the user in to Chrome.
   void SetTrustedSigninProcessID(int id);
 
   void AddEmailToOneClickRejectedList(const std::string& email);
   void EnableOneClick(bool enable);
   void AllowSigninCookies(bool enable);
   void SetAllowedUsernamePattern(const std::string& pattern);
   ProfileSyncServiceMock* CreateProfileSyncServiceMock();
   void SubmitGAIAPassword(OneClickSigninHelper* helper);
+  OneClickSigninHelper* SetupHelperForSignin();
 
   SigninManagerMock* signin_manager_;
 
  protected:
   TestingProfile* profile_;
 
  private:
   // Members to fake that we are on the UI thread.
   content::TestBrowserThread ui_thread_;
 
@@ skipping 37 matching lines @@
           profile_, BuildSigninManagerMock));
   if (signin_manager_)
     signin_manager_->SetSigninProcess(trusted_signin_process_id_);
   if (!username.empty()) {
     ASSERT_TRUE(signin_manager_);
     signin_manager_->StartSignIn(username, std::string(), std::string(),
                                 std::string());
   }
 }
 
+OneClickSigninHelper* OneClickSigninHelperTest::SetupHelperForSignin() {
+  CreateSigninManager(false, "");
+  EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
+        WillRepeatedly(Return(true));
+
+  CreateProfileSyncServiceMock();
+
+  content::WebContents* contents = web_contents();
+
+  OneClickSigninHelper::CreateForWebContents(contents);
+  OneClickSigninHelper* helper =
+      OneClickSigninHelper::FromWebContents(contents);
+
+  GURL continueUrl(
+      "https://www.google.com/intl/en-US/chrome/blank.html?source=1");
+  OneClickSigninHelper::ShowInfoBarUIThread(
+      "session_index", "user@gmail.com",
+      OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT,
+      SyncPromoUI::SOURCE_NTP_LINK,
+      continueUrl, process()->GetID(), rvh()->GetRoutingID());
+
+  SubmitGAIAPassword(helper);
+
+  NavigateAndCommit(continueUrl);
+  helper->DidStopLoading(rvh());
+  helper->OnStateChanged();
+  return helper;
+}
+
 void OneClickSigninHelperTest::EnableOneClick(bool enable) {
   PrefService* pref_service = Profile::FromBrowserContext(
       browser_context_.get())->GetPrefs();
   pref_service->SetBoolean(prefs::kReverseAutologinEnabled, enable);
 }
 
 void OneClickSigninHelperTest::AddEmailToOneClickRejectedList(
     const std::string& email) {
   PrefService* pref_service = Profile::FromBrowserContext(
       browser_context_.get())->GetPrefs();
@@ skipping 405 matching lines @@
 
   NavigateAndCommit(GURL("https://chrome.google.com/webstore?source=3"));
   helper->DidStopLoading(rvh());
 
   helper->OnStateChanged();
   EXPECT_EQ(GURL(continueUrl), contents->GetURL());
   EXPECT_EQ("user@gmail.com", signin_manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(OneClickSigninHelperTest, ShowSigninBubbleAfterSigninComplete) {
-  CreateSigninManager(false, std::string());
-  EXPECT_CALL(*signin_manager_, IsAllowedUsername(_))
-      .WillRepeatedly(Return(true));
-
-  CreateProfileSyncServiceMock();
-
-  content::WebContents* contents = web_contents();
-
-  OneClickSigninHelper::CreateForWebContents(contents);
-  OneClickSigninHelper* helper =
-      OneClickSigninHelper::FromWebContents(contents);
-
-  GURL continueUrl(
-      "https://www.google.com/intl/en-US/chrome/blank.html?source=1");
-  OneClickSigninHelper::ShowInfoBarUIThread(
-      "session_index", "user@gmail.com",
-      OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT,
-      SyncPromoUI::SOURCE_NTP_LINK,
-      continueUrl, process()->GetID(), rvh()->GetRoutingID());
-
-  SubmitGAIAPassword(helper);
-
-  NavigateAndCommit(continueUrl);
-  helper->DidStopLoading(rvh());
-  helper->OnStateChanged();
-
+  OneClickSigninHelper* helper = SetupHelperForSignin();
   PrefService* pref_service = profile_->GetPrefs();
   EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), false);
   helper->SigninSuccess();
   EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), true);
 }
 
+TEST_F(OneClickSigninHelperTest, SigninCancelled) {
+  OneClickSigninHelper* helper = SetupHelperForSignin();
+
+  PrefService* pref_service = profile_->GetPrefs();
+  EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), false);
+  GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
+  helper->SigninFailed(error);
+  // Should not show the NTP bubble on user cancellation.
+  EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), false);
+}
+
+TEST_F(OneClickSigninHelperTest, SigninFailed) {
+  OneClickSigninHelper* helper = SetupHelperForSignin();
+
+  PrefService* pref_service = profile_->GetPrefs();
+  EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), false);
+  GoogleServiceAuthError error(
+      GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
+  helper->SigninFailed(error);
+  // Should show the NTP bubble with an error.
+  EXPECT_EQ(pref_service->GetBoolean(prefs::kSyncPromoShowNTPBubble), true);
+}
+
 // I/O thread tests
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThread) {
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 valid_gaia_url_, std::string(), &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadIncognito) {
@@ skipping 136 matching lines @@
       prefs::kSigninAllowed, base::Value::CreateBooleanValue(true));
 
   // Simulate a policy disabling sync by writing kSyncManaged directly.
   // We should still offer to sign in the browser.
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 valid_gaia_url_, std::string(), &request_, io_data.get()));
 }