Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(706)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Issue 11411267: Make sure to display an errors that occur during the chrome sign in process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ntp bubble Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/sync/one_click_signin_helper.cc ('K') | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents.cc » ('j') | chrome/browser/ui/tab_contents/tab_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 39454d80127df9734226e3245b3710098822b8fe..08c60455ed21f44434ae0a90bef4c6403324a88f 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -48,13 +48,6 @@ const char kImplicitURLString[] =
"https://accounts.google.com/ServiceLogin"
"?service=foo&continue=http://foo.google.com";
-bool UseWebBasedSigninFlow() {
- const bool use_web_based_singin_flow =
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kUseWebBasedSigninFlow);
- return use_web_based_singin_flow;
-}
-
class SigninManagerMock : public FakeSigninManager {
public:
explicit SigninManagerMock(Profile* profile)
@@ -332,8 +325,16 @@ TestProfileIOData* OneClickSigninHelperIOTest::CreateTestProfileIOData(
}
TEST_F(OneClickSigninHelperTest, CanOfferNoContents) {
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, "user@gmail.com", true));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(NULL, "", false));
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ NULL, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ NULL, OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ NULL, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOffer) {
@@ -342,15 +343,31 @@ TEST_F(OneClickSigninHelperTest, CanOffer) {
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
+ int error_message_id = 0;
+
EnableOneClick(true);
- EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(), "user@gmail.com",
- true));
- EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(), "", false));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
EnableOneClick(false);
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "user@gmail.com",
- true));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "", false));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
@@ -368,13 +385,16 @@ TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
sync->set_first_setup_in_progress(true);
- EXPECT_EQ(UseWebBasedSigninFlow(),
- OneClickSigninHelper::CanOffer(web_contents(),
- "foo@gmail.com",
- true));
- EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(),
- "foo@gmail.com",
- false));
+ int error_message_id = 0;
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
@@ -383,15 +403,22 @@ TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
- 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(),
- "",
- false));
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferUsernameNotAllowed) {
@@ -400,12 +427,16 @@ TEST_F(OneClickSigninHelperTest, CanOfferUsernameNotAllowed) {
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(false));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(),
- "foo@gmail.com",
- true));
- EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(),
- "",
- false));
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
@@ -416,20 +447,38 @@ TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
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));
+
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "john@gmail.com", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferIncognito) {
CreateSigninManager(true, "");
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "user@gmail.com",
- true));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "", false));
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
@@ -439,9 +488,16 @@ TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "user@gmail.com",
- true));
- EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "", false));
+ int error_message_id = 0;
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
Andrew T Wilson (Slow) 2012/12/03 14:54:49 Should we be checking the value in error_message_i
+ "", &error_message_id));
}
// I/O thread tests
« chrome/browser/ui/sync/one_click_signin_helper.cc ('K') | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents.cc » ('j') | chrome/browser/ui/tab_contents/tab_contents.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698