Refactoring after comments in https://codereview.chromium.org/2639153002

chrome/browser/search_engines/template_url_service_test_util.cc

Index: chrome/browser/search_engines/template_url_service_test_util.cc
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index 722e2cc58d6cb3f6c68a197baf534cdb2f7b853c..aee657badda4cadf5cfdee42f61874d4f8a1e8c7 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -158,18 +158,11 @@ void TemplateURLServiceTestUtil::SetGoogleBaseURL(const GURL& base_url) {
 }
 
 TemplateURL* TemplateURLServiceTestUtil::AddExtensionControlledTURL(
-    std::unique_ptr<TemplateURL> extension_turl,
-    const std::string& extension_id,
-    bool wants_to_be_default,
-    base::Time install_time) {
-  auto extension_info =
-      base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(extension_id);
-  extension_info->wants_to_be_default_engine = wants_to_be_default;
-  extension_info->install_time = install_time;
-
-  TemplateURL* result = model()->AddExtensionControlledTURL(
-      std::move(extension_turl), std::move(extension_info));
-  if (wants_to_be_default && result) {
+    std::unique_ptr<TemplateURL> extension_turl) {
+  TemplateURL* result = model()->Add(std::move(extension_turl));
+  DCHECK(result);
+  DCHECK(result->GetExtensionInfoForTesting());

[vasilii, 2017/04/18 13:48:22]

ASSERT_TRUE is more appropriate

[Alexander Yashkin, 2017/04/18 14:36:14]

Can not use it here.
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...
"You can use assertions in any C++ function. In particular, it doesn't have to
be a method of the test fixture class. 
The one constraint is that assertions that generate a fatal failure (FAIL* and
ASSERT_*) can only be used in void-returning functions."

+  if (result->GetExtensionInfoForTesting()->wants_to_be_default_engine) {
     SetExtensionDefaultSearchInPrefs(profile()->GetTestingPrefService(),
                                      result->data());
   }