Skip to content

GitLab

T
tangled
Commit 8c803bdb authored by pkasting@chromium.org's avatar pkasting@chromium.org
Browse files
Options

Misc. protector cleanup: 

* Use GetSearchProviderHistogramID() more instead of hardcoding the expected histogram ID, for future-proofing against changing how we histogram these, as well as clarity
* No else after return

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9701037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126962 0039d316-1c4b-4281-b951-d872f2087c98
parent 589f3308
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 43 deletions
chrome/browser/protector/base_setting_change.h
View file @ 8c803bdb
......@@ -84,9 +84,8 @@ class BaseSettingChange {
// |backup| will be owned by the returned |BaseSettingChange| instance. |actual|
// is not owned and is safe to destroy after Protector::ShowChange has been
// called for the returned instance.
BaseSettingChange* CreateDefaultSearchProviderChange(
const TemplateURL* actual,
TemplateURL* backup);
BaseSettingChange* CreateDefaultSearchProviderChange(const TemplateURL* actual,
TemplateURL* backup);
// Allocates and initializes BaseSettingChange implementation for session
// startup setting. Reports corresponding histograms.
......
chrome/browser/protector/default_search_provider_change.cc
View file @ 8c803bdb
......@@ -286,13 +286,12 @@ string16 DefaultSearchProviderChange::GetBubbleTitle() const {
}
string16 DefaultSearchProviderChange::GetBubbleMessage() const {
if (!is_fallback_) {
return l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_MESSAGE);
} else {
if (is_fallback_) {
return l10n_util::GetStringFUTF16(
IDS_SEARCH_ENGINE_CHANGE_NO_BACKUP_MESSAGE,
default_search_provider_->short_name());
}
return l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_MESSAGE);
}
string16 DefaultSearchProviderChange::GetApplyButtonText() const {
......@@ -302,30 +301,27 @@ string16 DefaultSearchProviderChange::GetApplyButtonText() const {
if (fallback_is_new_)
return string16();
string16 name = new_search_provider_->short_name();
if (name.length() > kMaxDisplayedNameLength)
return l10n_util::GetStringUTF16(IDS_CHANGE_SEARCH_ENGINE_NO_NAME);
else
return l10n_util::GetStringFUTF16(IDS_CHANGE_SEARCH_ENGINE, name);
} else if (!is_fallback_) {
// New setting is lost, offer to go to settings.
return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
} else {
return (name.length() > kMaxDisplayedNameLength) ?
l10n_util::GetStringUTF16(IDS_CHANGE_SEARCH_ENGINE_NO_NAME) :
l10n_util::GetStringFUTF16(IDS_CHANGE_SEARCH_ENGINE, name);
}
if (is_fallback_) {
// Both settings are lost: don't show this button.
return string16();
}
// New setting is lost, offer to go to settings.
return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
}
string16 DefaultSearchProviderChange::GetDiscardButtonText() const {
if (!is_fallback_) {
string16 name = default_search_provider_->short_name();
if (name.length() > kMaxDisplayedNameLength)
return l10n_util::GetStringUTF16(IDS_KEEP_SETTING);
else
return l10n_util::GetStringFUTF16(IDS_KEEP_SEARCH_ENGINE, name);
} else {
// Old setting is lost, offer to go to settings.
return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
return (name.length() > kMaxDisplayedNameLength) ?
l10n_util::GetStringUTF16(IDS_KEEP_SETTING) :
l10n_util::GetStringFUTF16(IDS_KEEP_SEARCH_ENGINE, name);
}
// Old setting is lost, offer to go to settings.
return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
}
void DefaultSearchProviderChange::OnTemplateURLServiceChanged() {
......@@ -398,9 +394,8 @@ TemplateURLService* DefaultSearchProviderChange::GetTemplateURLService() {
return url_service;
}
BaseSettingChange* CreateDefaultSearchProviderChange(
const TemplateURL* actual,
TemplateURL* backup) {
BaseSettingChange* CreateDefaultSearchProviderChange(const TemplateURL* actual,
TemplateURL* backup) {
return new DefaultSearchProviderChange(actual, backup);
}
......
chrome/browser/protector/default_search_provider_change_browsertest.cc
View file @ 8c803bdb
......@@ -152,8 +152,11 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValid) {
// they are different.
TemplateURL* backup_url =
MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
TemplateURL* current_url =
MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
int current_histogram_id =
protector::GetSearchProviderHistogramID(current_url);
AddCopy(backup_url);
AddAndSetDefault(current_url);
......@@ -169,9 +172,9 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValid) {
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
SEARCH_ENGINE_OTHER, 1);
current_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
SEARCH_ENGINE_OTHER, 1);
backup_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
......@@ -185,14 +188,14 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValid) {
EXPECT_EQ(FindTemplateURL(http_example_info),
turl_service_->GetDefaultSearchProvider());
ExpectHistogramCount(kProtectorHistogramSearchProviderDiscarded,
SEARCH_ENGINE_OTHER, 1);
current_histogram_id, 1);
// Verify that Apply switches back to |current_url|.
change->Apply(browser());
EXPECT_EQ(FindTemplateURL(http_example_com),
turl_service_->GetDefaultSearchProvider());
ExpectHistogramCount(kProtectorHistogramSearchProviderApplied,
SEARCH_ENGINE_OTHER, 1);
current_histogram_id, 1);
}
IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValidLongNames) {
......@@ -244,8 +247,12 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValidLongNames) {
IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupInvalid) {
// Backup is invalid, current search provider exists, fallback to the
// prepopulated default search, which exists among keywords.
int prepopulated_histogram_id =
protector::GetSearchProviderHistogramID(prepopulated_url_.get());
TemplateURL* current_url =
MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
int current_histogram_id =
protector::GetSearchProviderHistogramID(current_url);
AddAndSetDefault(current_url);
......@@ -263,11 +270,11 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupInvalid) {
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
SEARCH_ENGINE_OTHER, 1);
current_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
......@@ -293,8 +300,12 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Backup is invalid, current search provider exists, fallback to the
// prepopulated default search, which was removed from keywords (will be
// added).
int prepopulated_histogram_id =
protector::GetSearchProviderHistogramID(prepopulated_url_.get());
TemplateURL* current_url =
MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
int current_histogram_id =
protector::GetSearchProviderHistogramID(current_url);
AddAndSetDefault(current_url);
......@@ -315,13 +326,13 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
SEARCH_ENGINE_OTHER, 1);
current_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderMissing,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
......@@ -347,6 +358,7 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Backup is valid, no current search provider.
TemplateURL* backup_url =
MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
AddCopy(backup_url);
turl_service_->SetDefaultSearchProvider(NULL);
......@@ -362,9 +374,9 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
SEARCH_ENGINE_NONE, 1);
protector::GetSearchProviderHistogramID(NULL), 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
SEARCH_ENGINE_OTHER, 1);
backup_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
......@@ -388,6 +400,8 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
BackupInvalidCurrentRemoved) {
// Backup is invalid, no current search provider, fallback to the prepopulated
// default search.
int prepopulated_histogram_id =
protector::GetSearchProviderHistogramID(prepopulated_url_.get());
turl_service_->SetDefaultSearchProvider(NULL);
scoped_ptr<BaseSettingChange> change(
......@@ -401,11 +415,11 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
SEARCH_ENGINE_NONE, 1);
protector::GetSearchProviderHistogramID(NULL), 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
......@@ -424,6 +438,8 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
BackupInvalidFallbackSameAsCurrent) {
// Backup is invalid, fallback to the prepopulated default search which is
// same as the current search provider.
int prepopulated_histogram_id =
protector::GetSearchProviderHistogramID(prepopulated_url_.get());
const TemplateURL* current_url = turl_service_->GetDefaultSearchProvider();
// Verify that current search provider is same as the prepopulated default.
......@@ -440,11 +456,11 @@ IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
// Verify histograms.
ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
prepopulated_url_->search_engine_type(), 1);
prepopulated_histogram_id, 1);
// Verify text messages.
EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
......
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