Address bug where the one-click sign-in bar would never show again once

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 "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_manager_fake.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class OneClickSigninHelperTest : public content::RenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
 
   virtual void SetUp() OVERRIDE;
 
  protected:
   // Creates a mock WebContents for tests.  If |use_incognito| is true then
   // a WebContents for an incognito profile is created.  If |username| is
   // is not empty, the profile of the mock WebContents will be connected to
   // the given account.
   content::WebContents* CreateMockWebContents(bool use_incognito,
                                               const std::string& username);
 
+  void AddEmailToOneClickRejectedList(const std::string& email);
   void EnableOneClick(bool enable);
 
   void AllowSigninCookies(bool enable);
 
  private:
   // Members to fake that we are on the UI thread.
   content::TestBrowserThread ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelperTest);
 };
@@ skipping 25 matching lines @@
 
   return CreateTestWebContents();
 }
 
 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();
+  ListPrefUpdate updater(pref_service,
+                         prefs::kReverseAutologinRejectedEmailList);
+  updater->AppendIfNotPresent(Value::CreateStringValue(email));
+}
+
 void OneClickSigninHelperTest::AllowSigninCookies(bool enable) {
   CookieSettings* cookie_settings =
       CookieSettings::Factory::GetForProfile(
           Profile::FromBrowserContext(browser_context_.get()));
   cookie_settings->SetDefaultCookieSetting(
       enable ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
-} // namespace
+}  // namespace
 
 TEST_F(OneClickSigninHelperTest, CanOfferNoContents) {
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, true));
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, false));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, "user@gmail.com", true));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, "user@gmail.com", false));

[Roger Tawa OOO till Jul 10th, 2012/06/15 17:56:00]

Should probably always use an empty email when check_connected is false, and a
non-empty email when checked_connected is true.  Applies to calls below too.

[Mathieu, 2012/06/21 13:13:00]

Done.

 }
 
 TEST_F(OneClickSigninHelperTest, CanOffer) {
   content::WebContents* web_contents = CreateMockWebContents(false, "");
 
   EnableOneClick(true);
-  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, true));
-  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, false));
+  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, "", true));
+  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, "", false));
 
   EnableOneClick(false);
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, false));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", true));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", false));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
   content::WebContents* web_contents = CreateMockWebContents(false,
                                                              "foo@gmail.com");
 
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
-  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, false));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents,
+                                              "foo@gmail.com",
+                                              true));

[Roger Tawa OOO till Jul 10th, 2012/06/15 17:56:00]

should probably add another EXPECT_FALSE case with a different email address.

[Mathieu, 2012/06/21 13:13:00]

Done.

+  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents,
+                                             "foo@gmail.com",
+                                             false));
+}
+
+TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
+  content::WebContents* web_contents = CreateMockWebContents(false, "");
+
+  AddEmailToOneClickRejectedList("foo@gmail.com");
+  AddEmailToOneClickRejectedList("user@gmail.com");
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "foo@gmail.com",
+                                              true));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "user@gmail.com",
+                                              true));
+  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents, "john@gmail.com",
+                                              true));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferIncognito) {
   content::WebContents* web_contents = CreateMockWebContents(true, "");
 
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, false));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", true));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", false));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
   content::WebContents* web_contents = CreateMockWebContents(false, "");
   AllowSigninCookies(false);
 
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
-  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, false));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", true));
+  EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", false));
 }