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

Side by Side Diff: chrome/browser/autocomplete/search_provider_unittest.cc

Issue 231863008: Rename SetDefaultSearchProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/autocomplete/search_provider.h" 5 #include "chrome/browser/autocomplete/search_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 247
248 // Reset the default TemplateURL. 248 // Reset the default TemplateURL.
249 TemplateURLData data; 249 TemplateURLData data;
250 data.short_name = ASCIIToUTF16("t"); 250 data.short_name = ASCIIToUTF16("t");
251 data.SetURL("http://defaultturl/{searchTerms}"); 251 data.SetURL("http://defaultturl/{searchTerms}");
252 data.suggestions_url = "http://defaultturl2/{searchTerms}"; 252 data.suggestions_url = "http://defaultturl2/{searchTerms}";
253 data.instant_url = "http://does/not/exist?strk=1"; 253 data.instant_url = "http://does/not/exist?strk=1";
254 data.search_terms_replacement_key = "strk"; 254 data.search_terms_replacement_key = "strk";
255 default_t_url_ = new TemplateURL(&profile_, data); 255 default_t_url_ = new TemplateURL(&profile_, data);
256 turl_model->Add(default_t_url_); 256 turl_model->Add(default_t_url_);
257 turl_model->SetDefaultSearchProvider(default_t_url_); 257 turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
258 TemplateURLID default_provider_id = default_t_url_->id(); 258 TemplateURLID default_provider_id = default_t_url_->id();
259 ASSERT_NE(0, default_provider_id); 259 ASSERT_NE(0, default_provider_id);
260 260
261 // Add url1, with search term term1_. 261 // Add url1, with search term term1_.
262 term1_url_ = AddSearchToHistory(default_t_url_, term1_, 1); 262 term1_url_ = AddSearchToHistory(default_t_url_, term1_, 1);
263 263
264 // Create another TemplateURL. 264 // Create another TemplateURL.
265 data.short_name = ASCIIToUTF16("k"); 265 data.short_name = ASCIIToUTF16("k");
266 data.SetKeyword(ASCIIToUTF16("k")); 266 data.SetKeyword(ASCIIToUTF16("k"));
267 data.SetURL("http://keyword/{searchTerms}"); 267 data.SetURL("http://keyword/{searchTerms}");
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 TEST_F(SearchProviderTest, CommandLineOverrides) { 1016 TEST_F(SearchProviderTest, CommandLineOverrides) {
1017 TemplateURLService* turl_model = 1017 TemplateURLService* turl_model =
1018 TemplateURLServiceFactory::GetForProfile(&profile_); 1018 TemplateURLServiceFactory::GetForProfile(&profile_);
1019 1019
1020 TemplateURLData data; 1020 TemplateURLData data;
1021 data.short_name = ASCIIToUTF16("default"); 1021 data.short_name = ASCIIToUTF16("default");
1022 data.SetKeyword(data.short_name); 1022 data.SetKeyword(data.short_name);
1023 data.SetURL("{google:baseURL}{searchTerms}"); 1023 data.SetURL("{google:baseURL}{searchTerms}");
1024 default_t_url_ = new TemplateURL(&profile_, data); 1024 default_t_url_ = new TemplateURL(&profile_, data);
1025 turl_model->Add(default_t_url_); 1025 turl_model->Add(default_t_url_);
1026 turl_model->SetDefaultSearchProvider(default_t_url_); 1026 turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
1027 1027
1028 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL, 1028 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
1029 "http://www.bar.com/"); 1029 "http://www.bar.com/");
1030 CommandLine::ForCurrentProcess()->AppendSwitchASCII( 1030 CommandLine::ForCurrentProcess()->AppendSwitchASCII(
1031 switches::kExtraSearchQueryParams, "a=b"); 1031 switches::kExtraSearchQueryParams, "a=b");
1032 1032
1033 TestData cases[] = { 1033 TestData cases[] = {
1034 { ASCIIToUTF16("k a"), 2, 1034 { ASCIIToUTF16("k a"), 2,
1035 { ResultInfo(GURL("http://keyword/a"), 1035 { ResultInfo(GURL("http://keyword/a"),
1036 AutocompleteMatchType::SEARCH_OTHER_ENGINE, 1036 AutocompleteMatchType::SEARCH_OTHER_ENGINE,
(...skipping 2030 matching lines...) Expand 10 before | Expand all | Expand 10 after
3067 // Verbatim match duplicates are added such that each one has a higher 3067 // Verbatim match duplicates are added such that each one has a higher
3068 // relevance than the previous one. 3068 // relevance than the previous one.
3069 EXPECT_EQ(2U, verbatim.duplicate_matches.size()); 3069 EXPECT_EQ(2U, verbatim.duplicate_matches.size());
3070 3070
3071 // Other match duplicates are added in descending relevance order. 3071 // Other match duplicates are added in descending relevance order.
3072 EXPECT_EQ(1U, match_alpha.duplicate_matches.size()); 3072 EXPECT_EQ(1U, match_alpha.duplicate_matches.size());
3073 EXPECT_EQ(1U, match_avid.duplicate_matches.size()); 3073 EXPECT_EQ(1U, match_avid.duplicate_matches.size());
3074 3074
3075 EXPECT_EQ(0U, match_apricot.duplicate_matches.size()); 3075 EXPECT_EQ(0U, match_apricot.duplicate_matches.size());
3076 } 3076 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698