diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 22:08:16 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 22:08:16 +0000 |
| commit | c808593aa9b58d8c647713214477bd237eb5e0fc (patch) | |
| tree | 8c91bc6e34424df600ab7ddc33286feacfed6d7f /chrome/browser/search_engines/search_provider_install_data_unittest.cc | |
| parent | add68c87534edb4b6b50f35e75213f422083d5b9 (diff) | |
| download | chromium_src-c808593aa9b58d8c647713214477bd237eb5e0fc.zip chromium_src-c808593aa9b58d8c647713214477bd237eb5e0fc.tar.gz chromium_src-c808593aa9b58d8c647713214477bd237eb5e0fc.tar.bz2 | |
Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate the TemplateURL NULL constructor, most public non-const TemplateURL functions, and most TemplateURL friend declarations.
This is also a necessary precursor to changing TemplateURLService's APIs to convert most "const TemplateURL*" cases to "TemplateURL*", which I'll explain once I actually make the change.
There is some awkwardness here around keywords, as keyword autogeneration requires a TemplateURL but the state bits are kept on TemplateURLData. This will go away in the future when I remove keyword autogeneration from TemplateURL entirely.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9982018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/search_provider_install_data_unittest.cc')
| -rw-r--r-- | chrome/browser/search_engines/search_provider_install_data_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index 3d8c584..1d2ccbd 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -232,10 +232,11 @@ void SearchProviderInstallDataTest::SimulateDefaultSearchIsManaged( TemplateURL* SearchProviderInstallDataTest::AddNewTemplateURL( const std::string& url, const string16& keyword) { - TemplateURL* t_url = new TemplateURL(); - t_url->set_short_name(keyword); - t_url->set_keyword(keyword); - t_url->SetURL(url); + TemplateURLData data; + data.short_name = keyword; + data.SetKeyword(keyword); + data.SetURL(url); + TemplateURL* t_url = new TemplateURL(data); util_.model()->Add(t_url); return t_url; } |