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..4629c8c88dccbfed670842481e464eab5571d8d6 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->GetExtensionInfoForTesting());

[Peter Kasting, 2017/04/13 00:11:01]

This unconditionally derefs the pointer, but then we conditionally check it
below.  That doesn't make sense.

Either this should be DCHECK(!result || ...), or we should DCHECK(result) as
well and remove it from the conditional below.

[Alexander Yashkin, 2017/04/13 06:07:50]

Added DCHECK(result)

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