diff options
Diffstat (limited to 'chrome/browser/autocomplete')
10 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index a2cd035..1b381fc 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -218,7 +218,7 @@ void AutocompleteProviderTest::RegisterTemplateURL( TemplateURLData data; data.SetURL(template_url); data.SetKeyword(keyword); - TemplateURL* default_t_url = new TemplateURL(&profile_, data); + TemplateURL* default_t_url = new TemplateURL(data); TemplateURLService* turl_model = TemplateURLServiceFactory::GetForProfile(&profile_); turl_model->Add(default_t_url); @@ -294,7 +294,7 @@ void AutocompleteProviderTest:: // Reset the default TemplateURL. TemplateURLData data; data.SetURL("http://defaultturl/{searchTerms}"); - TemplateURL* default_t_url = new TemplateURL(&profile_, data); + TemplateURL* default_t_url = new TemplateURL(data); TemplateURLService* turl_model = TemplateURLServiceFactory::GetForProfile(&profile_); turl_model->Add(default_t_url); @@ -307,7 +307,7 @@ void AutocompleteProviderTest:: data2.short_name = base::ASCIIToUTF16("k"); data2.SetKeyword(base::ASCIIToUTF16("k")); data2.SetURL("http://keyword/{searchTerms}"); - TemplateURL* keyword_t_url = new TemplateURL(&profile_, data2); + TemplateURL* keyword_t_url = new TemplateURL(data2); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -328,7 +328,7 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() { data.short_name = base::ASCIIToUTF16("foo.com"); data.SetKeyword(base::ASCIIToUTF16("foo.com")); data.SetURL("http://foo.com/{searchTerms}"); - TemplateURL* keyword_t_url = new TemplateURL(&profile_, data); + TemplateURL* keyword_t_url = new TemplateURL(data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -336,7 +336,7 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() { data.short_name = base::ASCIIToUTF16("bar.com"); data.SetKeyword(base::ASCIIToUTF16("bar.com")); data.SetURL("http://bar.com/{searchTerms}"); - keyword_t_url = new TemplateURL(&profile_, data); + keyword_t_url = new TemplateURL(data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc index 28ab9a5..238509b 100644 --- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc @@ -319,7 +319,7 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) { url_data.short_name = base::ASCIIToUTF16("unittest"); url_data.SetKeyword(base::ASCIIToUTF16("foo")); url_data.SetURL("http://www.foo.com/s?q={searchTerms}"); - test_util_.model()->Add(new TemplateURL(test_util_.profile(), url_data)); + test_util_.model()->Add(new TemplateURL(url_data)); TestData data[] = { { 0, 0, 1300 }, @@ -364,7 +364,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) { url_data.short_name = base::ASCIIToUTF16("unittest"); url_data.SetKeyword(base::ASCIIToUTF16("foo")); url_data.SetURL("http://www.foo.com/s?q={searchTerms}"); - test_util_.model()->Add(new TemplateURL(test_util_.profile(), url_data)); + test_util_.model()->Add(new TemplateURL(url_data)); AutocompleteMatch dup_match; dup_match.destination_url = GURL("http://www.foo.com/s?q=foo&oq=dup"); diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc index 5e55e9c..70833e9 100644 --- a/chrome/browser/autocomplete/base_search_provider.cc +++ b/chrome/browser/autocomplete/base_search_provider.cc @@ -467,7 +467,8 @@ void BaseSearchProvider::SetDeletionURL(const std::string& deletion_url, if (!template_service) return; GURL url = TemplateURLService::GenerateSearchURL( - template_service->GetDefaultSearchProvider()); + template_service->GetDefaultSearchProvider(), + template_service->search_terms_data()); url = url.GetOrigin().Resolve(deletion_url); if (url.is_valid()) { match->RecordAdditionalInfo(BaseSearchProvider::kDeletionUrlKey, diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index 31240fb..6d1e9bf7 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -649,7 +649,7 @@ TEST_F(HistoryQuickProviderTest, CullSearchResults) { data.SetURL("http://testsearch.com/?q={searchTerms}"); TemplateURLService* template_url_service = TemplateURLServiceFactory::GetForProfile(profile_.get()); - TemplateURL* template_url = new TemplateURL(profile_.get(), data); + TemplateURL* template_url = new TemplateURL(data); template_url_service->Add(template_url); template_url_service->SetUserSelectedDefaultSearchProvider(template_url); template_url_service->Load(); diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index f46eb96..d60910b 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -420,8 +420,7 @@ HistoryURLProviderParams::HistoryURLProviderParams( languages(languages), dont_suggest_exact_input(false), default_search_provider(default_search_provider ? - new TemplateURL(default_search_provider->profile(), - default_search_provider->data()) : NULL), + new TemplateURL(default_search_provider->data()) : NULL), search_terms_data(new SearchTermsDataSnapshot(search_terms_data)) { } diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 8680f419..ed3393a 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -792,7 +792,7 @@ TEST_F(HistoryURLProviderTest, CullSearchResults) { data.SetURL("http://testsearch.com/?q={searchTerms}"); TemplateURLService* template_url_service = TemplateURLServiceFactory::GetForProfile(profile_.get()); - TemplateURL* template_url = new TemplateURL(profile_.get(), data); + TemplateURL* template_url = new TemplateURL(data); template_url_service->Add(template_url); template_url_service->SetUserSelectedDefaultSearchProvider(template_url); template_url_service->Load(); diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index d172d46..adf5ecf 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -259,7 +259,7 @@ TEST_F(KeywordProviderTest, AddKeyword) { base::string16 keyword(ASCIIToUTF16("foo")); data.SetKeyword(keyword); data.SetURL("http://www.google.com/foo?q={searchTerms}"); - TemplateURL* template_url = new TemplateURL(NULL, data); + TemplateURL* template_url = new TemplateURL(data); model_->Add(template_url); ASSERT_TRUE(template_url == model_->GetTemplateURLForKeyword(keyword)); } diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index a27ba46..04928a3 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -253,7 +253,7 @@ void SearchProviderTest::SetUp() { data.suggestions_url = "http://defaultturl2/{searchTerms}"; data.instant_url = "http://does/not/exist?strk=1"; data.search_terms_replacement_key = "strk"; - default_t_url_ = new TemplateURL(&profile_, data); + default_t_url_ = new TemplateURL(data); turl_model->Add(default_t_url_); turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_); TemplateURLID default_provider_id = default_t_url_->id(); @@ -267,7 +267,7 @@ void SearchProviderTest::SetUp() { data.SetKeyword(ASCIIToUTF16("k")); data.SetURL("http://keyword/{searchTerms}"); data.suggestions_url = "http://suggest_keyword/{searchTerms}"; - keyword_t_url_ = new TemplateURL(&profile_, data); + keyword_t_url_ = new TemplateURL(data); turl_model->Add(keyword_t_url_); ASSERT_NE(0, keyword_t_url_->id()); @@ -1033,7 +1033,7 @@ TEST_F(SearchProviderTest, CommandLineOverrides) { data.short_name = ASCIIToUTF16("default"); data.SetKeyword(data.short_name); data.SetURL("{google:baseURL}{searchTerms}"); - default_t_url_ = new TemplateURL(&profile_, data); + default_t_url_ = new TemplateURL(data); turl_model->Add(default_t_url_); turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_); @@ -2896,7 +2896,7 @@ TEST_F(SearchProviderTest, CanSendURL) { template_url_data.instant_url = "http://does/not/exist?strk=1"; template_url_data.search_terms_replacement_key = "strk"; template_url_data.id = SEARCH_ENGINE_GOOGLE; - TemplateURL google_template_url(&profile_, template_url_data); + TemplateURL google_template_url(template_url_data); // Create field trial. base::FieldTrial* field_trial = base::FieldTrialList::CreateFieldTrial( @@ -3131,7 +3131,7 @@ TEST_F(SearchProviderTest, SuggestQueryUsesToken) { data.SetURL("http://example/{searchTerms}{google:sessionToken}"); data.suggestions_url = "http://suggest/?q={searchTerms}&{google:sessionToken}"; - default_t_url_ = new TemplateURL(&profile_, data); + default_t_url_ = new TemplateURL(data); turl_model->Add(default_t_url_); turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_); diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc index 8178bdb..a35e75b 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc @@ -103,7 +103,7 @@ void ShortcutsBackendTest::SetSearchProvider() { data.SetURL("http://foo.com/search?bar={searchTerms}"); data.SetKeyword(base::UTF8ToUTF16("foo")); - TemplateURL* template_url = new TemplateURL(&profile_, data); + TemplateURL* template_url = new TemplateURL(data); // Takes ownership of |template_url|. template_url_service->Add(template_url); template_url_service->SetUserSelectedDefaultSearchProvider(template_url); diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc index f2bfdc7..14df843 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc @@ -77,7 +77,7 @@ void ZeroSuggestProviderTest::SetUp() { data.suggestions_url = "https://www.google.com/complete/?q={searchTerms}"; data.instant_url = "https://does/not/exist?strk=1"; data.search_terms_replacement_key = "strk"; - default_t_url_ = new TemplateURL(&profile_, data); + default_t_url_ = new TemplateURL(data); turl_model->Add(default_t_url_); turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_); |