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

Unified Diff: chrome/browser/search_engines/template_url_service_unittest.cc

Issue 2814743006: Refactoring after comments in https://codereview.chromium.org/2639153002 (Closed)
Patch Set: Fixed after review, round 2 Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index c3b8de661f0c6b8c009edbf0d440e4c34cd821b0..72483e0df34ea9e48c0883771f3a1f60f51d5094 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -260,10 +260,9 @@ TemplateURL* TemplateURLServiceTest::AddExtensionSearchEngine(
turl_data->safe_for_autoreplace = false;
auto ext_dse = base::MakeUnique<TemplateURL>(
- *turl_data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
- return test_util()->AddExtensionControlledTURL(
- std::move(ext_dse), extension_name, wants_to_be_default_engine,
- install_time);
+ *turl_data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, extension_name,
+ install_time, wants_to_be_default_engine);
+ return test_util()->AddExtensionControlledTURL(std::move(ext_dse));
}
void TemplateURLServiceTest::AssertEquals(const TemplateURL& expected,
@@ -1891,13 +1890,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) {
model()->GetDefaultSearchProvider();
ExpectSimilar(expected_managed_default.get(), actual_managed_default);
- std::unique_ptr<TemplateURL> ext_dse = CreateKeywordWithDate(
- model(), "ext1", "ext1", "http://www.ext1.com/s?q={searchTerms}",
- std::string(), std::string(), std::string(), true, kPrepopulatedId,
- "UTF-8", Time(), Time(), Time(),
- TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
- TemplateURL* ext_dse_ptr =
- test_util()->AddExtensionControlledTURL(std::move(ext_dse), "ext1", true);
+ TemplateURL* ext_dse_ptr = AddExtensionSearchEngine("ext1", "ext1", true);
EXPECT_EQ(ext_dse_ptr,
model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1")));
EXPECT_TRUE(model()->is_default_search_managed());
« no previous file with comments | « chrome/browser/search_engines/template_url_service_test_util.cc ('k') | components/search_engines/template_url.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698