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

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 unit tests 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.h ('K') | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents.cc » ('j') | no next file with comments »
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 0806aa5ab75baef5125ab63db270d4e8ddb426a0..c19bc5f279518d1dca27219f366c70c387736fda 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -24,11 +24,11 @@
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.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 "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::_;
@@ -48,11 +48,6 @@ const char kImplicitURLString[] =
"https://accounts.google.com/ServiceLogin"
"?service=foo&continue=http://foo.google.com";
-bool UseWebBasedSigninFlow() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kUseWebBasedSigninFlow);
-}
-
class SigninManagerMock : public FakeSigninManager {
public:
explicit SigninManagerMock(Profile* profile)
@@ -330,8 +325,19 @@ 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_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ NULL, OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ NULL, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
}
TEST_F(OneClickSigninHelperTest, CanOffer) {
@@ -341,14 +347,33 @@ TEST_F(OneClickSigninHelperTest, CanOffer) {
WillRepeatedly(Return(true));
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", NULL));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", NULL));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", NULL));
EnableOneClick(false);
- 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_EQ(0, 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));
+ EXPECT_EQ(0, error_message_id);
}
TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
@@ -366,13 +391,15 @@ 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));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "foo@gmail.com", NULL));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", NULL));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", NULL));
}
TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
@@ -381,29 +408,46 @@ 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_EQ(IDS_SYNC_SETUP_ERROR, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(IDS_SYNC_SETUP_ERROR, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_EQ(IDS_SYNC_SETUP_ERROR, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(IDS_SYNC_SETUP_ERROR, error_message_id);
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferUsernameNotAllowed) {
- CreateSigninManager(false, "foo@gmail.com");
+ CreateSigninManager(false, "");
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_EQ(IDS_SYNC_LOGIN_NAME_PROHIBITED, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "foo@gmail.com", &error_message_id));
+ EXPECT_EQ(IDS_SYNC_LOGIN_NAME_PROHIBITED, error_message_id);
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
}
TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
@@ -414,20 +458,43 @@ 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_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(0, 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_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
}
TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
@@ -437,9 +504,19 @@ 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_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
+ "user@gmail.com", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
+ EXPECT_FALSE(OneClickSigninHelper::CanOffer(
+ web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ "", &error_message_id));
+ EXPECT_EQ(0, error_message_id);
}
// I/O thread tests
« chrome/browser/ui/sync/one_click_signin_helper.h ('K') | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698