diff options
Diffstat (limited to 'chrome/browser/profiles')
5 files changed, 12 insertions, 14 deletions
diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.cc b/chrome/browser/profiles/gaia_info_update_service_factory.cc index f8f46f7..88ef612 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.cc +++ b/chrome/browser/profiles/gaia_info_update_service_factory.cc @@ -39,8 +39,7 @@ void GAIAInfoUpdateServiceFactory::RegisterUserPrefs( PrefRegistrySyncable* prefs) { prefs->RegisterInt64Pref(prefs::kProfileGAIAInfoUpdateTime, 0, PrefRegistrySyncable::UNSYNCABLE_PREF); - prefs->RegisterStringPref(prefs::kProfileGAIAInfoPictureURL, - std::string(), + prefs->RegisterStringPref(prefs::kProfileGAIAInfoPictureURL, "", PrefRegistrySyncable::UNSYNCABLE_PREF); } diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index 37dfdd7..dd85970 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -184,8 +184,7 @@ TEST_F(GAIAInfoUpdateServiceTest, LogOut) { GAIAInfoUpdateService service(profile()); EXPECT_FALSE(service.GetCachedPictureURL().empty()); // Log out. - profile()->GetPrefs() - ->SetString(prefs::kGoogleServicesUsername, std::string()); + profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, ""); // Verify that the GAIA name and picture, and picture URL are unset. EXPECT_TRUE(GetCache()->GetGAIANameOfProfileAtIndex(0).empty()); @@ -194,8 +193,7 @@ TEST_F(GAIAInfoUpdateServiceTest, LogOut) { } TEST_F(GAIAInfoUpdateServiceTest, LogIn) { - profile()->GetPrefs() - ->SetString(prefs::kGoogleServicesUsername, std::string()); + profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, ""); GAIAInfoUpdateServiceMock service(profile()); // Log in. diff --git a/chrome/browser/profiles/profile_downloader_unittest.cc b/chrome/browser/profiles/profile_downloader_unittest.cc index 5346694..2e47968 100644 --- a/chrome/browser/profiles/profile_downloader_unittest.cc +++ b/chrome/browser/profiles/profile_downloader_unittest.cc @@ -68,25 +68,25 @@ TEST_F(ProfileDownloaderTest, ParseData) { true); // Data with only name. - VerifyWithNameAndURL("Pat Smith", std::string(), std::string(), true); + VerifyWithNameAndURL("Pat Smith", "", "", true); // Data with only URL. VerifyWithNameAndURL( - std::string(), + "", "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg", "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg", true); // Data without name or URL. - VerifyWithNameAndURL(std::string(), std::string(), std::string(), false); + VerifyWithNameAndURL("", "", "", false); // Data with an invalid URL. - VerifyWithNameAndURL(std::string(), "invalid url", std::string(), false); + VerifyWithNameAndURL( "", "invalid url", "", false); } TEST_F(ProfileDownloaderTest, DefaultURL) { // Empty URL should be default photo - EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL(std::string())); + EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL("")); // Picasa default photo EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL( "https://example.com/-4/AAAAAAAAAAA/AAAAAAAAAAE/G/s64-c/photo.jpg")); diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index a068fb3..f99cbba 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -289,8 +289,9 @@ void ProfileImpl::RegisterUserPrefs(PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(prefs::kProfileAvatarIndex, -1, PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterStringPref( - prefs::kProfileName, std::string(), PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterStringPref(prefs::kProfileName, + "", + PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref(prefs::kProfileIsManaged, false, PrefRegistrySyncable::SYNCABLE_PREF); diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 69da963..59f2e69 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -890,7 +890,7 @@ void ProfileManager::CreateMultiProfileAsync( // static void ProfileManager::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterStringPref(prefs::kProfileLastUsed, std::string()); + registry->RegisterStringPref(prefs::kProfileLastUsed, ""); registry->RegisterIntegerPref(prefs::kProfilesNumCreated, 1); registry->RegisterListPref(prefs::kProfilesLastActive); } |