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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/search_provider_unittest.cc

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 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
« chrome/browser/autocomplete/autocomplete_input.h ('K') | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/autocomplete/shortcuts_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index a27ba4674178c6ab2c4083a951ed21148614248d..7c5e15ddeed5eba3cc9ee6831094e1eec0b5efdd 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -297,7 +297,7 @@ void SearchProviderTest::RunTest(TestData* cases,
for (int i = 0; i < num_cases; ++i) {
AutocompleteInput input(cases[i].input, base::string16::npos,
base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false,
+ metrics::OmniboxEventProto::INVALID_SPEC, false,
prefer_keyword, true, true);
provider_->Start(input, false);
matches = provider_->matches();
@@ -343,7 +343,7 @@ void SearchProviderTest::QueryForInput(const base::string16& text,
bool prefer_keyword) {
// Start a query.
AutocompleteInput input(text, base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC,
+ metrics::OmniboxEventProto::INVALID_SPEC,
prevent_inline_autocomplete, prefer_keyword, true,
true);
provider_->Start(input, false);
@@ -882,7 +882,7 @@ TEST_F(SearchProviderTest, KeywordOrderingAndDescriptions) {
AutocompleteProvider::TYPE_SEARCH);
controller.Start(AutocompleteInput(
ASCIIToUTF16("k t"), base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::INVALID_SPEC, false, false, true, true));
+ metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true));
const AutocompleteResult& result = controller.result();
// There should be three matches, one for the keyword history, one for
@@ -2907,7 +2907,7 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(&profile_);
signin->SetAuthenticatedUsername("test");
@@ -2915,14 +2915,14 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_TRUE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
// Not in field trial.
ResetFieldTrialList();
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
field_trial = base::FieldTrialList::CreateFieldTrial(
"AutocompleteDynamicTrial_2", "EnableZeroSuggest");
field_trial->group();
@@ -2931,59 +2931,59 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("badpageurl"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
// Invalid page classification.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS,
+ metrics::OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS,
&profile_));
// Invalid page classification.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS,
+ metrics::OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS,
&profile_));
// HTTPS page URL on same domain as provider.
EXPECT_TRUE(SearchProvider::CanSendURL(
GURL("https://www.google.com/search"),
GURL("https://www.google.com/complete/search"),
- &google_template_url, AutocompleteInput::OTHER, &profile_));
+ &google_template_url, metrics::OmniboxEventProto::OTHER, &profile_));
// Non-HTTP[S] page URL on same domain as provider.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("ftp://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
// Non-HTTP page URL on different domain.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("https://www.notgoogle.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
// Non-HTTPS provider.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("http://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
// Suggest disabled.
profile_.GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, false);
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
profile_.GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
// Incognito.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, profile_.GetOffTheRecordProfile()));
+ metrics::OmniboxEventProto::OTHER, profile_.GetOffTheRecordProfile()));
// Tab sync not enabled.
profile_.GetPrefs()->SetBoolean(sync_driver::prefs::kSyncKeepEverythingSynced,
@@ -2992,7 +2992,7 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
profile_.GetPrefs()->SetBoolean(sync_driver::prefs::kSyncTabs, true);
// Tab sync is encrypted.
@@ -3004,7 +3004,7 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
encrypted_types.Remove(syncer::SESSIONS);
service->OnEncryptedTypesChanged(encrypted_types, false);
@@ -3012,7 +3012,7 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_TRUE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- AutocompleteInput::OTHER, &profile_));
+ metrics::OmniboxEventProto::OTHER, &profile_));
}
TEST_F(SearchProviderTest, TestDeleteMatch) {
« chrome/browser/autocomplete/autocomplete_input.h ('K') | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/autocomplete/shortcuts_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698