diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:36:13 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:36:13 +0000 |
| commit | 405aae294f9e67d20b5cae174b8a096d610e3257 (patch) | |
| tree | f7f64a1843d6e252c7b67c5f45baae05ef65fc96 /chrome/browser/autocomplete/autocomplete_unittest.cc | |
| parent | be1545a85c0b19024239111d8139374d291a56aa (diff) | |
| download | chromium_src-405aae294f9e67d20b5cae174b8a096d610e3257.zip chromium_src-405aae294f9e67d20b5cae174b8a096d610e3257.tar.gz chromium_src-405aae294f9e67d20b5cae174b8a096d610e3257.tar.bz2 | |
Remove fields from TemplateURL[Ref] that are part of the OSDD spec but never actually meaningfully set by the browser:
* TemplateURLRef: |index_offset_|, |page_offset_|
* TemplateURL: |description_|, |languages_|
Also remove TemplateURL::ImageRef and the |image_refs_| field and replace with a simple GURL |favicon_url_|. We only used the vector inside the parser, and we ended up only caring about a single favicon-sized, appropriately-typed image, so just move those conditions into the parser and simplify everyone else.
Finally, convert a number of pass-or-return-by-value functions in template_url_h to use const refs.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9917001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_unittest.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc index ed35f16..5e2050f 100644 --- a/chrome/browser/autocomplete/autocomplete_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_unittest.cc @@ -183,7 +183,7 @@ void AutocompleteProviderTest:: // Reset the default TemplateURL. TemplateURL* default_t_url = new TemplateURL(); - default_t_url->SetURL("http://defaultturl/{searchTerms}", 0, 0); + default_t_url->SetURL("http://defaultturl/{searchTerms}"); TemplateURLService* turl_model = TemplateURLServiceFactory::GetForProfile(&profile_); turl_model->Add(default_t_url); @@ -195,7 +195,7 @@ void AutocompleteProviderTest:: TemplateURL* keyword_t_url = new TemplateURL(); keyword_t_url->set_short_name(ASCIIToUTF16("k")); keyword_t_url->set_keyword(ASCIIToUTF16("k")); - keyword_t_url->SetURL("http://keyword/{searchTerms}", 0, 0); + keyword_t_url->SetURL("http://keyword/{searchTerms}"); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -226,7 +226,7 @@ void AutocompleteProviderTest:: TemplateURL* keyword_t_url = new TemplateURL(); keyword_t_url->set_short_name(ASCIIToUTF16("foo.com")); keyword_t_url->set_keyword(ASCIIToUTF16("foo.com")); - keyword_t_url->SetURL("http://foo.com/{searchTerms}", 0, 0); + keyword_t_url->SetURL("http://foo.com/{searchTerms}"); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -234,7 +234,7 @@ void AutocompleteProviderTest:: keyword_t_url = new TemplateURL(); keyword_t_url->set_short_name(ASCIIToUTF16("bar.com")); keyword_t_url->set_keyword(ASCIIToUTF16("bar.com")); - keyword_t_url->SetURL("http://bar.com/{searchTerms}", 0, 0); + keyword_t_url->SetURL("http://bar.com/{searchTerms}"); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); |