summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines/search_provider_install_data_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 19:41:22 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 19:41:22 +0000
commit9ca2d12e82907e3e902c3b51861bb7f0b3dc0116 (patch)
treed4e8564692fb6d59755a34beae493050e945f659 /chrome/browser/search_engines/search_provider_install_data_unittest.cc
parentc4c4704f83038b07dc024ea38be284edcd8f987e (diff)
downloadchromium_src-9ca2d12e82907e3e902c3b51861bb7f0b3dc0116.zip
chromium_src-9ca2d12e82907e3e902c3b51861bb7f0b3dc0116.tar.gz
chromium_src-9ca2d12e82907e3e902c3b51861bb7f0b3dc0116.tar.bz2
Misc. small cleanups to minimize TemplateURL refactoring diffs:
Non-functional changes: * 0 -> TemplateURLRef::NO_SUGGESTIONS_AVAILABLE * GURL x = GURL(...) -> GURL x(...) * Infobar -> InfoBar * AllSources -> AllBrowserContextsAndSources * Pass a Profile* to SearchProviderInstallData, which it will need for more purposes once UIThreadSearchTermsData takes a Profile* * Add/modify comments * "" -> std::string() * Other trivial changes to minimize diffs Functional changes: * TemplateURLFetcher::RequestDelegate::AddSearchProvider() no longer clears the keyword for a newly-added, explicitly-requested TemplateURL that conflicts with a non-replaceable keyword. This means the conflicting keyword will appear in the dialog box and the box will indicate a conflict. This is mostly to avoid giving a TemplateURL an empty keyword, which will later be made illegal. * TemplateURLFetcher::ScheduleDownload() now expects the provided keyword to be non-NULL for autodetected cases (which was always true already) and ignores the keyword for explicit cases (which only matters to tests, as the actual browser code always passed an empty keyword here anyway). * TemplateURLService::CanReplaceKeyword() now always sets its outparam. This prevents any possible use-without-set on the caller side. * Properly order (expected, actual) * ASSERT -> EXPECT * Construct the TemplateURL for TemplateURLTableModel::Add() in that function rather than the caller. This will make it easier to change TemplateURLs to require a Profile* later. * Check all fields at the end of WebDatabaseMigrationTest.MigrateVersion27ToCurrent BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9811022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128270 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.cc2
1 files changed, 1 insertions, 1 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 53fa591..2c9d9d0 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -189,7 +189,7 @@ void SearchProviderInstallDataTest::SetUp() {
testing::Test::SetUp();
util_.SetUp();
util_.StartIOThread();
- install_data_ = new SearchProviderInstallData(util_.GetWebDataService(),
+ install_data_ = new SearchProviderInstallData(util_.profile(),
content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
content::Source<SearchProviderInstallDataTest>(this));
}