Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/sync/test/integration/two_client_search_engines_sync_test.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 "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using search_engines_helper::AddSearchEngine;
 using search_engines_helper::AllServicesMatch;
 using search_engines_helper::ChangeDefaultSearchProvider;
 using search_engines_helper::CreateTestTemplateURL;
-using search_engines_helper::DeleteSearchEngineByKeyword;
 using search_engines_helper::DeleteSearchEngineBySeed;
 using search_engines_helper::EditSearchEngine;
 using search_engines_helper::GetServiceForProfile;
 using search_engines_helper::GetVerifierService;
 using search_engines_helper::ServiceMatchesVerifier;
 
 class TwoClientSearchEnginesSyncTest : public SyncTest {
  public:
   TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientSearchEnginesSyncTest() {}
@@ skipping 144 matching lines @@
   // client0: { SE0, SE1, SE2 }
   for (int i = 0; i < 3; ++i) {
     AddSearchEngine(0, i);
   }
 
   // client1: { SE0, SE2, SE3, SE0 + different URL }
   AddSearchEngine(1, 0);
   AddSearchEngine(1, 2);
   AddSearchEngine(1, 3);
   GetServiceForProfile(1)->Add(CreateTestTemplateURL(0,
-      "http://www.somethingelse.com/", ASCIIToUTF16("somethingelse.com"),
+      ASCIIToUTF16("somethingelse.com"), "http://www.somethingelse.com/",
       "somethingelse"));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllServicesMatch());
 }
 
 // TCM ID - 8906436.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllServicesMatch());
@@ skipping 41 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
   // Change the default on the first client and delete the old default.
   ChangeDefaultSearchProvider(0, 1);
   DeleteSearchEngineBySeed(0, 0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(AllServicesMatch());
 }