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

chrome/browser/search_engines/template_url_service_sync_unittest.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 <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 424 matching lines @@
 }
 
 TEST_F(TemplateURLServiceSyncTest, GetAllSyncDataWithSearchOverrideExtension) {
   model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key1"), "http://key1.com"));
   model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key2"), "http://key2.com"));
 
   // Change default search provider to an extension one.
   std::unique_ptr<TemplateURLData> extension =
       GenerateDummyTemplateURLData("extension");
   auto ext_dse = base::MakeUnique<TemplateURL>(
-      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
-  test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true);
+      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(),
+      true);
+  test_util_a_->AddExtensionControlledTURL(std::move(ext_dse));
 
   const TemplateURL* ext_turl = model()->GetDefaultSearchProvider();
   EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch());
 
   // Extension default search must not be synced across browsers.
   syncer::SyncDataList all_sync_data =
       model()->GetAllSyncData(syncer::SEARCH_ENGINES);
   EXPECT_EQ(2U, all_sync_data.size());
 
   for (auto sync_data : all_sync_data) {
@@ skipping 1295 matching lines @@
 
   const size_t sync_engines_count =
       model()->GetAllSyncData(syncer::SEARCH_ENGINES).size();
   EXPECT_EQ(3U, sync_engines_count);
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
 
   // Change the default search provider to an extension one.
   std::unique_ptr<TemplateURLData> extension =
       GenerateDummyTemplateURLData("extensiondefault");
   auto ext_dse = base::MakeUnique<TemplateURL>(
-      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
-  test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true);
+      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(),
+      true);
+  test_util_a_->AddExtensionControlledTURL(std::move(ext_dse));
 
   const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider();
   EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch());
 
   // Extension-related changes to the DSE should not be synced as search engine
   // changes.
   EXPECT_EQ(pending_changes, processor()->change_list_size());
   EXPECT_EQ(sync_engines_count,
             model()->GetAllSyncData(syncer::SEARCH_ENGINES).size());
 
@@ skipping 30 matching lines @@
 TEST_F(TemplateURLServiceSyncTest, ExtensionAndNormalEngineConflict) {
   // Start with empty model.
   model()->MergeDataAndStartSyncing(syncer::SEARCH_ENGINES,
                                     syncer::SyncDataList(), PassProcessor(),
                                     CreateAndPassSyncErrorFactory());
   const base::string16 kCommonKeyword = ASCIIToUTF16("common_keyword");
   // Change the default search provider to an extension one.
   std::unique_ptr<TemplateURLData> extension =
       GenerateDummyTemplateURLData("common_keyword");
   auto ext_dse = base::MakeUnique<TemplateURL>(
-      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+      *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(),
+      true);
   const TemplateURL* extension_turl =
-      test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true);
+      test_util_a_->AddExtensionControlledTURL(std::move(ext_dse));
   EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch());
   EXPECT_EQ(extension_turl, model()->GetTemplateURLForKeyword(kCommonKeyword));
 
   // Add through sync normal engine with the same keyword as extension.
   syncer::SyncChangeList changes;
   changes.push_back(CreateTestSyncChange(
       syncer::SyncChange::ACTION_ADD,
       CreateTestTemplateURL(kCommonKeyword, "http://normal.com", "normal_guid",
                             10)));
   model()->ProcessSyncChanges(FROM_HERE, changes);
@@ skipping 654 matching lines @@
 
 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) {
   model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"),
                                      "http://key1.com"));
   syncer::SyncDataList initial_data = CreateInitialSyncData();
 
   model()->MergeDataAndStartSyncing(
       syncer::SEARCH_ENGINES, initial_data, PassProcessor(),
       CreateAndPassSyncErrorFactory());
 }