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

chrome/browser/search_engines/template_url_service_test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 140 matching lines @@
   return search_term;
 }
 
 void TemplateURLServiceTestUtil::SetGoogleBaseURL(const GURL& base_url) {
   DCHECK(base_url.is_valid());
   search_terms_data_->set_google_base_url(base_url.spec());
   model_->GoogleBaseURLChanged();
 }
 
 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());
   }
   return result;
 }
 
 void TemplateURLServiceTestUtil::RemoveExtensionControlledTURL(
     const std::string& extension_id) {
   TemplateURL* turl = model()->FindTemplateURLForExtension(
       extension_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
   ASSERT_TRUE(turl);
   ASSERT_TRUE(turl->GetExtensionInfoForTesting());
   if (turl->GetExtensionInfoForTesting()->wants_to_be_default_engine)
     RemoveExtensionDefaultSearchFromPrefs(profile()->GetTestingPrefService());
   model()->RemoveExtensionControlledTURL(
       extension_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
 }