Skip to content

GitLab

T
tangled
Commit 427c8da4 authored by Kyle Milka's avatar Kyle Milka Committed by Commit Bot
Browse files
Options

[NTP] Add method to check if a custom background is set 

Add a method to InstantService to check if a custom background
has been set. Clean up a few places that were checking the
pref directly.

Bug: 873699
Change-Id: I755c6d26cb5fc6cce1239fd796fbfc5e3fb45ce5
Reviewed-on: https://chromium-review.googlesource.com/c/1338091Reviewed-by: default avatarRamya Nagarajan <ramyan@chromium.org>
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610955}
parent 8cf3cc0c
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 28 deletions
chrome/browser/search/instant_service.cc
View file @ 427c8da4
...@@ -620,8 +620,6 @@ void InstantService::BuildThemeInfo() { ...@@ -620,8 +620,6 @@ void InstantService::BuildThemeInfo() {
} }
} }
// TODO(crbug.com/863942): Should switching default search provider retain the
// copy of user uploaded photos?
void InstantService::ApplyOrResetCustomBackgroundThemeInfo() { void InstantService::ApplyOrResetCustomBackgroundThemeInfo() {
// Reset the pref if the feature is disabled. // Reset the pref if the feature is disabled.
if (!features::IsCustomBackgroundsEnabled()) { if (!features::IsCustomBackgroundsEnabled()) {
...@@ -636,19 +634,8 @@ void InstantService::ApplyOrResetCustomBackgroundThemeInfo() { ...@@ -636,19 +634,8 @@ void InstantService::ApplyOrResetCustomBackgroundThemeInfo() {
} }
// Attempt to get custom background URL from preferences. // Attempt to get custom background URL from preferences.
const base::DictionaryValue* background_info = GURL custom_background_url;
pref_service_->GetDictionary(prefs::kNtpCustomBackgroundDict); if (!IsCustomBackgroundPrefValid(custom_background_url)) {
const base::Value* background_url =
background_info->FindKey(kNtpCustomBackgroundURL);
if (!background_url) {
ResetCustomBackgroundThemeInfo();
return;
}
// Verify that the custom background URL is valid.
GURL custom_background_url(
background_info->FindKey(kNtpCustomBackgroundURL)->GetString());
if (!custom_background_url.is_valid()) {
ResetCustomBackgroundThemeInfo(); ResetCustomBackgroundThemeInfo();
return; return;
} }
...@@ -745,6 +732,34 @@ void InstantService::FallbackToDefaultThemeInfo() { ...@@ -745,6 +732,34 @@ void InstantService::FallbackToDefaultThemeInfo() {
theme_info_->custom_background_attribution_action_url = GURL(); theme_info_->custom_background_attribution_action_url = GURL();
} }
bool InstantService::IsCustomBackgroundSet() {
GURL custom_background_url;
if (!IsCustomBackgroundPrefValid(custom_background_url))
return false;
if (IsLocalFileUrl(custom_background_url) &&
!pref_service_->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice)) {
return false;
}
return true;
}
bool InstantService::IsCustomBackgroundPrefValid(GURL& custom_background_url) {
const base::DictionaryValue* background_info =
profile_->GetPrefs()->GetDictionary(prefs::kNtpCustomBackgroundDict);
if (!background_info)
return false;
const base::Value* background_url =
background_info->FindKey(kNtpCustomBackgroundURL);
if (!background_url)
return false;
custom_background_url = GURL(background_url->GetString());
return custom_background_url.is_valid();
}
void InstantService::RemoveLocalBackgroundImageCopy() { void InstantService::RemoveLocalBackgroundImageCopy() {
base::FilePath path = profile_->GetPath().AppendASCII( base::FilePath path = profile_->GetPath().AppendASCII(
chrome::kChromeSearchLocalNtpBackgroundFilename); chrome::kChromeSearchLocalNtpBackgroundFilename);
......
chrome/browser/search/instant_service.h
View file @ 427c8da4
...@@ -132,6 +132,9 @@ class InstantService : public KeyedService, ...@@ -132,6 +132,9 @@ class InstantService : public KeyedService,
void AddValidBackdropUrlForTesting(const GURL& url) const; void AddValidBackdropUrlForTesting(const GURL& url) const;
// Check if a custom background has been set by the user.
bool IsCustomBackgroundSet();
private: private:
class SearchProviderObserver; class SearchProviderObserver;
...@@ -178,6 +181,10 @@ class InstantService : public KeyedService, ...@@ -178,6 +181,10 @@ class InstantService : public KeyedService,
void RemoveLocalBackgroundImageCopy(); void RemoveLocalBackgroundImageCopy();
// Returns false if the custom background pref cannot be parsed, otherwise
// returns true and sets custom_background_url to the value in the pref.
bool IsCustomBackgroundPrefValid(GURL& custom_background_url);
// Update the background pref to point to // Update the background pref to point to
// chrome-search://local-ntp/background.jpg // chrome-search://local-ntp/background.jpg
void SetBackgroundToLocalResource(); void SetBackgroundToLocalResource();
......
chrome/browser/search/instant_service_unittest.cc
View file @ 427c8da4
...@@ -99,6 +99,7 @@ TEST_F(InstantServiceTestCustomLinksEnabled, ...@@ -99,6 +99,7 @@ TEST_F(InstantServiceTestCustomLinksEnabled,
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, SetCustomBackgroundURL) { TEST_F(InstantServiceTestCustomBackgroundsEnabled, SetCustomBackgroundURL) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
instant_service_->AddValidBackdropUrlForTesting(kUrl); instant_service_->AddValidBackdropUrlForTesting(kUrl);
...@@ -106,9 +107,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, SetCustomBackgroundURL) { ...@@ -106,9 +107,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, SetCustomBackgroundURL) {
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kUrl, theme_info->custom_background_url); EXPECT_EQ(kUrl, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTest, SetCustomBackgroundURL) { TEST_F(InstantServiceTest, SetCustomBackgroundURL) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
instant_service_->UpdateThemeInfo(); instant_service_->UpdateThemeInfo();
...@@ -116,10 +119,12 @@ TEST_F(InstantServiceTest, SetCustomBackgroundURL) { ...@@ -116,10 +119,12 @@ TEST_F(InstantServiceTest, SetCustomBackgroundURL) {
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(GURL(), theme_info->custom_background_url); EXPECT_EQ(GURL(), theme_info->custom_background_url);
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
SetCustomBackgroundURLInvalidURL) { SetCustomBackgroundURLInvalidURL) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kInvalidUrl("foo"); const GURL kInvalidUrl("foo");
const GURL kValidUrl("https://www.foo.com"); const GURL kValidUrl("https://www.foo.com");
instant_service_->AddValidBackdropUrlForTesting(kValidUrl); instant_service_->AddValidBackdropUrlForTesting(kValidUrl);
...@@ -132,10 +137,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -132,10 +137,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(std::string(), theme_info->custom_background_url.spec()); EXPECT_EQ(std::string(), theme_info->custom_background_url.spec());
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
SetCustomBackgroundURLWithAttributions) { SetCustomBackgroundURLWithAttributions) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
const std::string kAttributionLine1 = "foo"; const std::string kAttributionLine1 = "foo";
const std::string kAttributionLine2 = "bar"; const std::string kAttributionLine2 = "bar";
...@@ -151,10 +158,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -151,10 +158,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(kAttributionLine2, EXPECT_EQ(kAttributionLine2,
theme_info->custom_background_attribution_line_2); theme_info->custom_background_attribution_line_2);
EXPECT_EQ(kActionUrl, theme_info->custom_background_attribution_action_url); EXPECT_EQ(kActionUrl, theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
ChangingSearchProviderClearsThemeInfoAndPref) { ChangingSearchProviderClearsThemeInfoAndPref) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
const std::string kAttributionLine1 = "foo"; const std::string kAttributionLine1 = "foo";
const std::string kAttributionLine2 = "bar"; const std::string kAttributionLine2 = "bar";
...@@ -172,6 +181,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -172,6 +181,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(kAttributionLine2, EXPECT_EQ(kAttributionLine2,
theme_info->custom_background_attribution_line_2); theme_info->custom_background_attribution_line_2);
EXPECT_EQ(kActionUrl, theme_info->custom_background_attribution_action_url); EXPECT_EQ(kActionUrl, theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
SetUserSelectedDefaultSearchProvider("https://www.search.com"); SetUserSelectedDefaultSearchProvider("https://www.search.com");
instant_service_->UpdateThemeInfo(); instant_service_->UpdateThemeInfo();
...@@ -181,6 +191,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -181,6 +191,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_1); EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_1);
EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_2); EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_2);
EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url); EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url);
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
SetUserSelectedDefaultSearchProvider("{google:baseURL}"); SetUserSelectedDefaultSearchProvider("{google:baseURL}");
instant_service_->UpdateThemeInfo(); instant_service_->UpdateThemeInfo();
...@@ -190,10 +201,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -190,10 +201,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_1); EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_1);
EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_2); EXPECT_EQ(std::string(), theme_info->custom_background_attribution_line_2);
EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url); EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url);
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
LocalBackgroundImageCopyCreated) { LocalBackgroundImageCopyCreated) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("chrome-search://local-ntp/background.jpg"); const GURL kUrl("chrome-search://local-ntp/background.jpg");
base::FilePath profile_path = profile()->GetPath(); base::FilePath profile_path = profile()->GetPath();
...@@ -212,10 +225,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -212,10 +225,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(true, file_exists); EXPECT_EQ(true, file_exists);
EXPECT_EQ(true, profile()->GetTestingPrefService()->GetBoolean( EXPECT_EQ(true, profile()->GetTestingPrefService()->GetBoolean(
prefs::kNtpCustomBackgroundLocalToDevice)); prefs::kNtpCustomBackgroundLocalToDevice));
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
ChangingSearchProviderRemovesLocalBackgroundImageCopy) { ChangingSearchProviderRemovesLocalBackgroundImageCopy) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
base::FilePath profile_path = profile()->GetPath(); base::FilePath profile_path = profile()->GetPath();
base::FilePath path(profile_path.AppendASCII( base::FilePath path(profile_path.AppendASCII(
chrome::kChromeSearchLocalNtpBackgroundFilename)); chrome::kChromeSearchLocalNtpBackgroundFilename));
...@@ -232,10 +247,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -232,10 +247,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(false, file_exists); EXPECT_EQ(false, file_exists);
EXPECT_EQ(false, profile()->GetTestingPrefService()->GetBoolean( EXPECT_EQ(false, profile()->GetTestingPrefService()->GetBoolean(
prefs::kNtpCustomBackgroundLocalToDevice)); prefs::kNtpCustomBackgroundLocalToDevice));
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
SettingUrlRemovesLocalBackgroundImageCopy) { SettingUrlRemovesLocalBackgroundImageCopy) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
base::FilePath profile_path = profile()->GetPath(); base::FilePath profile_path = profile()->GetPath();
...@@ -244,6 +261,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -244,6 +261,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
base::WriteFile(path, "background_image", 16); base::WriteFile(path, "background_image", 16);
instant_service_->AddValidBackdropUrlForTesting(kUrl);
instant_service_->SetCustomBackgroundURL(kUrl); instant_service_->SetCustomBackgroundURL(kUrl);
instant_service_->UpdateThemeInfo(); instant_service_->UpdateThemeInfo();
...@@ -254,10 +272,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -254,10 +272,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(false, file_exists); EXPECT_EQ(false, file_exists);
EXPECT_EQ(false, profile()->GetTestingPrefService()->GetBoolean( EXPECT_EQ(false, profile()->GetTestingPrefService()->GetBoolean(
prefs::kNtpCustomBackgroundLocalToDevice)); prefs::kNtpCustomBackgroundLocalToDevice));
ASSERT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
CustomBackgroundAttributionActionUrlReset) { CustomBackgroundAttributionActionUrlReset) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("https://www.foo.com"); const GURL kUrl("https://www.foo.com");
const std::string kAttributionLine1 = "foo"; const std::string kAttributionLine1 = "foo";
const std::string kAttributionLine2 = "bar"; const std::string kAttributionLine2 = "bar";
...@@ -272,12 +292,14 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -272,12 +292,14 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kHttpsActionUrl, EXPECT_EQ(kHttpsActionUrl,
theme_info->custom_background_attribution_action_url); theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURLWithAttributions( instant_service_->SetCustomBackgroundURLWithAttributions(
kUrl, kAttributionLine1, kAttributionLine2, kHttpActionUrl); kUrl, kAttributionLine1, kAttributionLine2, kHttpActionUrl);
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url); EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURLWithAttributions( instant_service_->SetCustomBackgroundURLWithAttributions(
kUrl, kAttributionLine1, kAttributionLine2, kHttpsActionUrl); kUrl, kAttributionLine1, kAttributionLine2, kHttpsActionUrl);
...@@ -285,16 +307,19 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -285,16 +307,19 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kHttpsActionUrl, EXPECT_EQ(kHttpsActionUrl,
theme_info->custom_background_attribution_action_url); theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURLWithAttributions( instant_service_->SetCustomBackgroundURLWithAttributions(
kUrl, kAttributionLine1, kAttributionLine2, GURL()); kUrl, kAttributionLine1, kAttributionLine2, GURL());
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url); EXPECT_EQ(GURL(), theme_info->custom_background_attribution_action_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
UpdatingPrefUpdatesThemeInfo) { UpdatingPrefUpdatesThemeInfo) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrlFoo("https://www.foo.com"); const GURL kUrlFoo("https://www.foo.com");
const GURL kUrlBar("https://www.bar.com"); const GURL kUrlBar("https://www.bar.com");
...@@ -306,6 +331,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -306,6 +331,7 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kUrlFoo, theme_info->custom_background_url); EXPECT_EQ(kUrlFoo, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
pref_service->SetUserPref( pref_service->SetUserPref(
prefs::kNtpCustomBackgroundDict, prefs::kNtpCustomBackgroundDict,
...@@ -315,9 +341,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -315,9 +341,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
EXPECT_EQ(kUrlBar, theme_info->custom_background_url); EXPECT_EQ(kUrlBar, theme_info->custom_background_url);
EXPECT_EQ(false, EXPECT_EQ(false,
pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice)); pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice));
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, NoLocalFileExists) { TEST_F(InstantServiceTestCustomBackgroundsEnabled, NoLocalFileExists) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789"); const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789");
sync_preferences::TestingPrefServiceSyncable* pref_service = sync_preferences::TestingPrefServiceSyncable* pref_service =
...@@ -332,9 +360,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, NoLocalFileExists) { ...@@ -332,9 +360,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, NoLocalFileExists) {
EXPECT_EQ(GURL(), theme_info->custom_background_url); EXPECT_EQ(GURL(), theme_info->custom_background_url);
EXPECT_EQ(false, EXPECT_EQ(false,
pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice)); pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice));
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFileExists) { TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFileExists) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789"); const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789");
sync_preferences::TestingPrefServiceSyncable* pref_service = sync_preferences::TestingPrefServiceSyncable* pref_service =
...@@ -355,9 +385,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFileExists) { ...@@ -355,9 +385,11 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFileExists) {
EXPECT_EQ(kUrl, theme_info->custom_background_url); EXPECT_EQ(kUrl, theme_info->custom_background_url);
EXPECT_EQ(true, EXPECT_EQ(true,
pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice)); pref_service->GetBoolean(prefs::kNtpCustomBackgroundLocalToDevice));
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFilePrefSet) { TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFilePrefSet) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789"); const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789");
sync_preferences::TestingPrefServiceSyncable* pref_service = sync_preferences::TestingPrefServiceSyncable* pref_service =
...@@ -372,10 +404,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFilePrefSet) { ...@@ -372,10 +404,12 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, LocalFilePrefSet) {
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kUrl, theme_info->custom_background_url); EXPECT_EQ(kUrl, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, TEST_F(InstantServiceTestCustomBackgroundsEnabled,
LocalFileCopiedToProfileDirectory) { LocalFileCopiedToProfileDirectory) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789"); const GURL kUrl("chrome-search://local-ntp/background.jpg?123456789");
sync_preferences::TestingPrefServiceSyncable* pref_service = sync_preferences::TestingPrefServiceSyncable* pref_service =
...@@ -397,12 +431,14 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ...@@ -397,12 +431,14 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled,
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kUrl, theme_info->custom_background_url); EXPECT_EQ(kUrl, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
EXPECT_FALSE(base::PathExists(old_path)); EXPECT_FALSE(base::PathExists(old_path));
EXPECT_TRUE(base::PathExists(new_path)); EXPECT_TRUE(base::PathExists(new_path));
} }
TEST_F(InstantServiceTestCustomBackgroundsEnabled, ValidateBackdropUrls) { TEST_F(InstantServiceTestCustomBackgroundsEnabled, ValidateBackdropUrls) {
ASSERT_FALSE(instant_service_->IsCustomBackgroundSet());
const GURL kBackdropUrl1("https://www.foo.com"); const GURL kBackdropUrl1("https://www.foo.com");
const GURL kBackdropUrl2("https://www.bar.com"); const GURL kBackdropUrl2("https://www.bar.com");
const GURL kNonBackdropUrl1("https://www.test.com"); const GURL kNonBackdropUrl1("https://www.test.com");
...@@ -414,16 +450,20 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ValidateBackdropUrls) { ...@@ -414,16 +450,20 @@ TEST_F(InstantServiceTestCustomBackgroundsEnabled, ValidateBackdropUrls) {
instant_service_->SetCustomBackgroundURL(kBackdropUrl1); instant_service_->SetCustomBackgroundURL(kBackdropUrl1);
ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting(); ThemeBackgroundInfo* theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kBackdropUrl1, theme_info->custom_background_url); EXPECT_EQ(kBackdropUrl1, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURL(kNonBackdropUrl1); instant_service_->SetCustomBackgroundURL(kNonBackdropUrl1);
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(GURL(), theme_info->custom_background_url); EXPECT_EQ(GURL(), theme_info->custom_background_url);
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURL(kBackdropUrl2); instant_service_->SetCustomBackgroundURL(kBackdropUrl2);
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(kBackdropUrl2, theme_info->custom_background_url); EXPECT_EQ(kBackdropUrl2, theme_info->custom_background_url);
EXPECT_TRUE(instant_service_->IsCustomBackgroundSet());
instant_service_->SetCustomBackgroundURL(kNonBackdropUrl2); instant_service_->SetCustomBackgroundURL(kNonBackdropUrl2);
theme_info = instant_service_->GetThemeInfoForTesting(); theme_info = instant_service_->GetThemeInfoForTesting();
EXPECT_EQ(GURL(), theme_info->custom_background_url); EXPECT_EQ(GURL(), theme_info->custom_background_url);
EXPECT_FALSE(instant_service_->IsCustomBackgroundSet());
} }
chrome/browser/ui/search/ntp_user_data_logger.cc
View file @ 427c8da4
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics.h"
#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/after_startup_task_utils.h"
#include "chrome/browser/search/instant_service.h"
#include "chrome/browser/search/instant_service_factory.h"
#include "chrome/browser/search/ntp_features.h" #include "chrome/browser/search/ntp_features.h"
#include "chrome/browser/search/search.h" #include "chrome/browser/search/search.h"
#include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service.h"
...@@ -87,10 +89,6 @@ enum VoiceError { ...@@ -87,10 +89,6 @@ enum VoiceError {
VOICE_ERROR_MAX VOICE_ERROR_MAX
}; };
// Key used in prefs::kNtpCustomBackgroundDict to save a background image URL.
// TODO(crbug.com/873699): Refactor customization check for better testability.
const char kNtpCustomBackgroundURL[] = "background_url";
// Logs BackgroundCustomization availability on the NTP, // Logs BackgroundCustomization availability on the NTP,
void LogBackgroundCustomizationAvailability( void LogBackgroundCustomizationAvailability(
BackgroundCustomization availability) { BackgroundCustomization availability) {
...@@ -490,15 +488,9 @@ bool NTPUserDataLogger::ThemeIsConfigured() const { ...@@ -490,15 +488,9 @@ bool NTPUserDataLogger::ThemeIsConfigured() const {
} }
bool NTPUserDataLogger::CustomBackgroundIsConfigured() const { bool NTPUserDataLogger::CustomBackgroundIsConfigured() const {
const base::DictionaryValue* background_info = InstantService* instant_service =
profile_->GetPrefs()->GetDictionary(prefs::kNtpCustomBackgroundDict); InstantServiceFactory::GetForProfile(profile_);
const base::Value* background_url = return instant_service->IsCustomBackgroundSet();
background_info->FindKey(kNtpCustomBackgroundURL);
if (!background_url) {
return false;
}
GURL custom_background_url(background_url->GetString());
return custom_background_url.is_valid();
} }
void NTPUserDataLogger::EmitNtpStatistics(base::TimeDelta load_time) { void NTPUserDataLogger::EmitNtpStatistics(base::TimeDelta load_time) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment