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

chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc

Index: chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc	(revision 131175)
+++ chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc	(working copy)
@@ -7,12 +7,6 @@
 #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::CreateTestTemplateURL;
-using search_engines_helper::GetServiceForProfile;
-using search_engines_helper::GetVerifierService;
-using search_engines_helper::ServiceMatchesVerifier;
-
 class SingleClientSearchEnginesSyncTest : public SyncTest {
  public:
   SingleClientSearchEnginesSyncTest() : SyncTest(SINGLE_CLIENT) {}
@@ -24,11 +18,11 @@
 
 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(ServiceMatchesVerifier(0));
+  ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));
 
-  AddSearchEngine(0, 0);
+  search_engines_helper::AddSearchEngine(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
       "Waiting for search engines to update."));
-  ASSERT_TRUE(ServiceMatchesVerifier(0));
+  ASSERT_TRUE(search_engines_helper::ServiceMatchesVerifier(0));
 }