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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 510783002: Rename AutocompleteProviderDelegate to AutocompleteProviderClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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/autocomplete/chrome_autocomplete_provider_delegate.cc ('k') | chrome/browser/autocomplete/zero_suggest_provider.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 1d24a24fd0e7485b533398cf83374de03b2dfbe4..a046d8d2688465931621cfc0811daab35accc3a4 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -18,7 +18,7 @@
#include "build/build_config.h"
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
#include "chrome/browser/autocomplete/autocomplete_controller.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
#include "chrome/browser/autocomplete/history_url_provider.h"
#include "chrome/browser/history/history_service.h"
@@ -88,8 +88,8 @@ SearchProviderForTest::SearchProviderForTest(
TemplateURLService* template_url_service,
Profile* profile)
: SearchProvider(listener, template_url_service,
- scoped_ptr<AutocompleteProviderDelegate>(
- new ChromeAutocompleteProviderDelegate(profile))),
+ scoped_ptr<AutocompleteProviderClient>(
+ new ChromeAutocompleteProviderClient(profile))),
is_success_(false) {
}
@@ -2949,13 +2949,13 @@ TEST_F(SearchProviderTest, CanSendURL) {
// Create field trial.
CreateZeroSuggestFieldTrial(true);
- ChromeAutocompleteProviderDelegate delegate(&profile_);
+ ChromeAutocompleteProviderClient client(&profile_);
// Not signed in.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(&profile_);
signin->SetAuthenticatedUsername("test");
@@ -2963,7 +2963,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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
// Not in field trial.
ResetFieldTrialList();
@@ -2971,7 +2971,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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
ResetFieldTrialList();
CreateZeroSuggestFieldTrial(true);
@@ -2979,63 +2979,63 @@ TEST_F(SearchProviderTest, CanSendURL) {
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("badpageurl"),
GURL("https://www.google.com/complete/search"), &google_template_url,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
// Invalid page classification.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
metrics::OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS,
- SearchTermsData(), &delegate));
+ SearchTermsData(), &client));
// Invalid page classification.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
metrics::OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS,
- SearchTermsData(), &delegate));
+ SearchTermsData(), &client));
// 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, metrics::OmniboxEventProto::OTHER,
- SearchTermsData(), &delegate));
+ SearchTermsData(), &client));
// 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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
// 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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
// Non-HTTPS provider.
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("http://www.google.com/complete/search"), &google_template_url,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
// 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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
profile_.GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
// Incognito.
- ChromeAutocompleteProviderDelegate delegate_incognito(
+ ChromeAutocompleteProviderClient client_incognito(
profile_.GetOffTheRecordProfile());
EXPECT_FALSE(SearchProvider::CanSendURL(
GURL("http://www.google.com/search"),
GURL("https://www.google.com/complete/search"), &google_template_url,
metrics::OmniboxEventProto::OTHER, SearchTermsData(),
- &delegate_incognito));
+ &client_incognito));
// Tab sync not enabled.
profile_.GetPrefs()->SetBoolean(sync_driver::prefs::kSyncKeepEverythingSynced,
@@ -3044,7 +3044,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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
profile_.GetPrefs()->SetBoolean(sync_driver::prefs::kSyncTabs, true);
// Tab sync is encrypted.
@@ -3056,7 +3056,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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
encrypted_types.Remove(syncer::SESSIONS);
service->OnEncryptedTypesChanged(encrypted_types, false);
@@ -3064,7 +3064,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,
- metrics::OmniboxEventProto::OTHER, SearchTermsData(), &delegate));
+ metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
}
TEST_F(SearchProviderTest, TestDeleteMatch) {
« no previous file with comments | « chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc ('k') | chrome/browser/autocomplete/zero_suggest_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698