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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 120343004: Reland r242290, r241609, r242134. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/views/profile_chooser_view.cc » ('j') | chrome/common/profile_management_switches.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 57fed78997df920811207c4b5613eb6f1b716a4e..f0a7f9451de10a27754b773a221d0a411b9aad98 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -51,15 +51,6 @@ using ::testing::Return;
namespace {
-// Explicit URLs are sign in URLs created by chrome for specific sign in access
-// points. Implicit URLs are those to sign for some Google service, like gmail
-// or drive. In former case, with a valid URL, we don't want to offer the
-// interstitial. In all other cases we do.
-
-const char kImplicitURLString[] =
- "https://accounts.google.com/ServiceLogin"
- "?service=foo&continue=http://foo.google.com";
-
class SigninManagerMock : public FakeSigninManager {
public:
explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {
@@ -748,20 +739,20 @@ 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()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadIncognito) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(true));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoIOData) {
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, NULL));
+ valid_gaia_url_, &request_, NULL));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadBadURL) {
@@ -769,60 +760,20 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadBadURL) {
EXPECT_EQ(
OneClickSigninHelper::IGNORE_REQUEST,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- GURL("https://foo.com/"), std::string(), &request_, io_data.get()));
+ GURL("https://foo.com/"), &request_, io_data.get()));
EXPECT_EQ(OneClickSigninHelper::IGNORE_REQUEST,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
GURL("http://accounts.google.com/"),
- std::string(),
&request_,
io_data.get()));
}
-TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadReferrer) {
- scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
- std::string continue_url(signin::GetPromoURL(
- signin::SOURCE_START_PAGE, false).spec());
-
- EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, continue_url, &request_, io_data.get()));
-
- EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, kImplicitURLString, &request_, io_data.get()));
-
- std::string bad_url_1 = continue_url;
- const std::string service_name = "chromiumsync";
- bad_url_1.replace(bad_url_1.find(service_name), service_name.length(),
- "foo");
-
- EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, bad_url_1, &request_, io_data.get()));
-
- std::string bad_url_2 = continue_url;
- const std::string source_num = "%3D0";
- bad_url_2.replace(bad_url_1.find(source_num), source_num.length(), "%3D10");
-
- EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, bad_url_2, &request_, io_data.get()));
-
- std::string bad_url_3 = continue_url;
- const std::string source = "source%3D0";
- bad_url_3.erase(bad_url_1.find(source), source.length());
-
- EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, bad_url_3, &request_, io_data.get()));
-}
-
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabled) {
EnableOneClick(false);
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadSignedIn) {
@@ -832,7 +783,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadSignedIn) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailNotAllowed) {
@@ -840,7 +791,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailNotAllowed) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailAlreadyUsed) {
@@ -853,7 +804,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailAlreadyUsed) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadWithRejectedEmail) {
@@ -861,7 +812,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadWithRejectedEmail) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
@@ -869,14 +820,14 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
// Simulate a policy disabling signin by writing kSigninAllowed directly.
// We should not offer to sign in the browser.
@@ -884,7 +835,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
prefs::kSigninAllowed, base::Value::CreateBooleanValue(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
// Reset the preference.
profile()->GetTestingPrefService()->SetManagedPref(
@@ -896,5 +847,5 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, std::string(), &request_, io_data.get()));
+ valid_gaia_url_, &request_, io_data.get()));
}
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/views/profile_chooser_view.cc » ('j') | chrome/common/profile_management_switches.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698