diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 18:40:26 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 18:40:26 +0000 |
commit | 16fca9b8a9e129a2bc50bc39fa3d2b33db64efdb (patch) | |
tree | 09d56d4b75a0651a3ad4f82a4111c2943af772a1 /chrome/browser/autocomplete/autocomplete_unittest.cc | |
parent | 5284ee3d4b255ba50147550b5de9df85fc71076d (diff) | |
download | chromium_src-16fca9b8a9e129a2bc50bc39fa3d2b33db64efdb.zip chromium_src-16fca9b8a9e129a2bc50bc39fa3d2b33db64efdb.tar.gz chromium_src-16fca9b8a9e129a2bc50bc39fa3d2b33db64efdb.tar.bz2 |
Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit less verbose, and will be useful later when UIThreadSearchTermsData starts taking a Profile*.
One downside is that there are a number of const_cast<>()s added when we try to access the profile() of a const TemplateURL*. These will all go away soon when TemplateURLService is switched to using "const" much less, so I didn't worry too much about them.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10173001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133483 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 9caf94b..b008294 100644 --- a/chrome/browser/autocomplete/autocomplete_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_unittest.cc @@ -184,7 +184,7 @@ void AutocompleteProviderTest:: // Reset the default TemplateURL. TemplateURLData data; data.SetURL("http://defaultturl/{searchTerms}"); - TemplateURL* default_t_url = new TemplateURL(data); + TemplateURL* default_t_url = new TemplateURL(&profile_, data); TemplateURLService* turl_model = TemplateURLServiceFactory::GetForProfile(&profile_); turl_model->Add(default_t_url); @@ -196,7 +196,7 @@ void AutocompleteProviderTest:: data.short_name = ASCIIToUTF16("k"); data.SetKeyword(ASCIIToUTF16("k")); data.SetURL("http://keyword/{searchTerms}"); - TemplateURL* keyword_t_url = new TemplateURL(data); + TemplateURL* keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -228,7 +228,7 @@ void AutocompleteProviderTest:: data.short_name = ASCIIToUTF16("foo.com"); data.SetKeyword(ASCIIToUTF16("foo.com")); data.SetURL("http://foo.com/{searchTerms}"); - TemplateURL* keyword_t_url = new TemplateURL(data); + TemplateURL* keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); @@ -236,7 +236,7 @@ void AutocompleteProviderTest:: data.short_name = ASCIIToUTF16("bar.com"); data.SetKeyword(ASCIIToUTF16("bar.com")); data.SetURL("http://bar.com/{searchTerms}"); - keyword_t_url = new TemplateURL(data); + keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); |