Win: Display a native bubble (instead of the JS one) after the web signin flow.

chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Index: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index 9b44ad3c91940682c5831326f12fbfaa897579b2..164c0912d46d6467cef452965878a00d7a96a2b5 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -274,35 +274,6 @@ void OneClickSigninHelperTest::CreateSigninManager(
   }
 }
 
-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();
@@ -679,7 +650,7 @@ TEST_F(OneClickSigninHelperTest, ShowInfoBarUIThreadIncognito) {
 }
 
 // If Chrome signin is triggered from a webstore install, and user chooses to
-// config sync, then Chrome should redirect immidiately to sync settings page,
+// config sync, then Chrome should redirect immediately to sync settings page,
 // and upon successful setup, redirect back to webstore.
 TEST_F(OneClickSigninHelperTest, SigninFromWebstoreWithConfigSyncfirst) {
   CreateSigninManager(false, std::string());
@@ -711,37 +682,6 @@ TEST_F(OneClickSigninHelperTest, SigninFromWebstoreWithConfigSyncfirst) {
   EXPECT_EQ("user@gmail.com", signin_manager_->GetAuthenticatedUsername());
 }
 
-TEST_F(OneClickSigninHelperTest, ShowSigninBubbleAfterSigninComplete) {
-  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);
-}
-

[Roger Tawa OOO till Jul 10th, 2013/04/17 17:53:25]

Instead of removing this tests, can they be rewritten to test that the new
bubble is showing?  Is there a platform independent way to test for that?

[noms (inactive), 2013/04/17 20:32:37]

To make sure it didn't go untested, I've rewritten them as browser tests. All
these particular tests used to do was check if a "showPopup" preference was set
in the PrefsService, which isn't applicable anymore. I'm not sure there is
something equivalent to tell whether the native dialog is showing.

On 2013/04/17 17:53:25, Roger Tawa wrote:

 // I/O thread tests
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThread) {