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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 months 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/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/ui/sync/tab_contents_synced_tab_delegate.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 e879b6e54422139c580a5e873164852a5dd4ea41..4892ab65bc936eb55aaff11a00b598eaf9942782 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -389,13 +389,15 @@ TEST_F(OneClickSigninHelperTest, CanOfferNoContents) {
"user@gmail.com", &error_message));
EXPECT_EQ("", error_message);
EXPECT_FALSE(OneClickSigninHelper::CanOffer(
- NULL, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", &error_message));
+ NULL,
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
EXPECT_EQ("", error_message);
}
TEST_F(OneClickSigninHelperTest, CanOffer) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
@@ -408,9 +410,10 @@ TEST_F(OneClickSigninHelperTest, 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));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ NULL));
EnableOneClick(false);
@@ -424,14 +427,15 @@ TEST_F(OneClickSigninHelperTest, CanOffer) {
web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_ALL,
"user@gmail.com", &error_message));
EXPECT_FALSE(OneClickSigninHelper::CanOffer(
- web_contents(),
- OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", &error_message));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
EXPECT_EQ("", error_message);
}
TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
@@ -454,8 +458,10 @@ TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
"foo@gmail.com", NULL));
EXPECT_TRUE(OneClickSigninHelper::CanOffer(
- web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", NULL));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ NULL));
}
TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
@@ -492,12 +498,14 @@ TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
UTF8ToUTF16("foo@gmail.com")),
error_message);
EXPECT_TRUE(OneClickSigninHelper::CanOffer(
- web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", &error_message));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
}
TEST_F(OneClickSigninHelperTest, CanOfferUsernameNotAllowed) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(false));
@@ -513,16 +521,15 @@ TEST_F(OneClickSigninHelperTest, CanOfferUsernameNotAllowed) {
"foo@gmail.com", &error_message));
EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SYNC_LOGIN_NAME_PROHIBITED),
error_message);
- EXPECT_TRUE(
- OneClickSigninHelper::CanOffer(
- web_contents(),
- OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "",
- &error_message));
+ EXPECT_TRUE(OneClickSigninHelper::CanOffer(
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
}
TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
@@ -551,7 +558,7 @@ TEST_F(OneClickSigninHelperTest, CanOfferWithRejectedEmail) {
}
TEST_F(OneClickSigninHelperTest, CanOfferIncognito) {
- CreateSigninManager(true, "");
+ CreateSigninManager(true, std::string());
std::string error_message;
EXPECT_FALSE(OneClickSigninHelper::CanOffer(
@@ -563,13 +570,15 @@ TEST_F(OneClickSigninHelperTest, CanOfferIncognito) {
"user@gmail.com", &error_message));
EXPECT_EQ("", error_message);
EXPECT_FALSE(OneClickSigninHelper::CanOffer(
- web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", &error_message));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
EXPECT_EQ("", error_message);
}
TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
AllowSigninCookies(false);
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
@@ -585,8 +594,10 @@ TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
"user@gmail.com", &error_message));
EXPECT_EQ("", error_message);
EXPECT_FALSE(OneClickSigninHelper::CanOffer(
- web_contents(), OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
- "", &error_message));
+ web_contents(),
+ OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+ std::string(),
+ &error_message));
EXPECT_EQ("", error_message);
}
@@ -595,7 +606,7 @@ TEST_F(OneClickSigninHelperTest, CanOfferUntrustedProcess) {
ASSERT_NE(trusted.GetID(), process()->GetID());
// Make sure the RenderProcessHost used by the test is untrusted.
SetTrustedSigninProcessID(trusted.GetID());
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
@@ -607,7 +618,7 @@ TEST_F(OneClickSigninHelperTest, CanOfferUntrustedProcess) {
}
TEST_F(OneClickSigninHelperTest, CanOfferDisabledByPolicy) {
- CreateSigninManager(false, "");
+ CreateSigninManager(false, std::string());
EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
WillRepeatedly(Return(true));
@@ -642,7 +653,7 @@ TEST_F(OneClickSigninHelperTest, CanOfferDisabledByPolicy) {
// Should not crash if a helper instance is not associated with an incognito
// web contents.
TEST_F(OneClickSigninHelperTest, ShowInfoBarUIThreadIncognito) {
- CreateSigninManager(true, "");
+ CreateSigninManager(true, std::string());
OneClickSigninHelper* helper =
OneClickSigninHelper::FromWebContents(web_contents());
EXPECT_EQ(NULL, helper);
@@ -657,9 +668,9 @@ TEST_F(OneClickSigninHelperTest, ShowInfoBarUIThreadIncognito) {
// config sync, then Chrome should redirect immidiately to sync settings page,
// and upon successful setup, redirect back to webstore.
TEST_F(OneClickSigninHelperTest, SigninFromWebstoreWithConfigSyncfirst) {
- CreateSigninManager(false, "");
- EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
- WillRepeatedly(Return(true));
+ CreateSigninManager(false, std::string());
+ EXPECT_CALL(*signin_manager_, IsAllowedUsername(_))
+ .WillRepeatedly(Return(true));
CreateProfileSyncServiceMock();
@@ -687,9 +698,9 @@ TEST_F(OneClickSigninHelperTest, SigninFromWebstoreWithConfigSyncfirst) {
}
TEST_F(OneClickSigninHelperTest, ShowSigninBubbleAfterSigninComplete) {
- CreateSigninManager(false, "");
- EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
- WillRepeatedly(Return(true));
+ CreateSigninManager(false, std::string());
+ EXPECT_CALL(*signin_manager_, IsAllowedUsername(_))
+ .WillRepeatedly(Return(true));
CreateProfileSyncServiceMock();
@@ -725,31 +736,34 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThread) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &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_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoIOData) {
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, NULL));
+ valid_gaia_url_, std::string(), &request_, NULL));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadBadURL) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
+ EXPECT_EQ(
+ OneClickSigninHelper::IGNORE_REQUEST,
+ OneClickSigninHelper::CanOfferOnIOThreadImpl(
+ GURL("https://foo.com/"), std::string(), &request_, io_data.get()));
EXPECT_EQ(OneClickSigninHelper::IGNORE_REQUEST,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- GURL("https://foo.com/"), "", &request_, io_data.get()));
- EXPECT_EQ(OneClickSigninHelper::IGNORE_REQUEST,
- OneClickSigninHelper::CanOfferOnIOThreadImpl(
- GURL("http://accounts.google.com/"), "",
- &request_, io_data.get()));
+ GURL("http://accounts.google.com/"),
+ std::string(),
+ &request_,
+ io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadReferrer) {
@@ -796,7 +810,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabled) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadSignedIn) {
@@ -806,7 +820,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadSignedIn) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailNotAllowed) {
@@ -814,7 +828,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailNotAllowed) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailAlreadyUsed) {
@@ -827,7 +841,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailAlreadyUsed) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadWithRejectedEmail) {
@@ -835,7 +849,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadWithRejectedEmail) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
@@ -843,14 +857,14 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &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_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
// Simulate a policy disabling signin by writing kSigninAllowed directly.
// We should not offer to sign in the browser.
@@ -858,7 +872,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
prefs::kSigninAllowed, base::Value::CreateBooleanValue(false));
EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
// Reset the preference.
profile_->GetTestingPrefService()->SetManagedPref(
@@ -870,5 +884,5 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
- valid_gaia_url_, "", &request_, io_data.get()));
+ valid_gaia_url_, std::string(), &request_, io_data.get()));
}
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698