| 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..90e4cecc9f55f839664bb43c0131125e8fbbe295 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
|
| +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
|
| @@ -748,20 +748,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 +769,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 +792,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 +800,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 +813,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 +821,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 +829,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 +844,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 +856,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()));
|
| }
|
|
|