Clean up some sync integration test code.

chrome/browser/sync/test/integration/search_engines_helper.h

Index: chrome/browser/sync/test/integration/search_engines_helper.h
===================================================================
--- chrome/browser/sync/test/integration/search_engines_helper.h	(revision 125990)
+++ chrome/browser/sync/test/integration/search_engines_helper.h	(working copy)
@@ -45,6 +45,13 @@
 // Create a TemplateURL with some test values based on |seed|. The caller owns
 // the returned TemplateURL*.
 TemplateURL* CreateTestTemplateURL(int seed);
+TemplateURL* CreateTestTemplateURL(int seed,
+                                   const string16& keyword,
+                                   const std::string& sync_guid);
+TemplateURL* CreateTestTemplateURL(int seed,
+                                   const std::string& url,
+                                   const string16& keyword,
+                                   const std::string& sync_guid);
 
 // Add a search engine based on a seed to the service at index |profile| and the
 // verifier if it is used.
@@ -54,14 +61,14 @@
 // keyword |keyword| and changes its user-visible fields. Does the same to the
 // verifier, if it is used.
 void EditSearchEngine(int profile,
-                      const std::string& keyword,
-                      const std::string& short_name,
-                      const std::string& new_keyword,
+                      const string16& keyword,
+                      const string16& short_name,
+                      const string16& new_keyword,
                       const std::string& url);
 
 // Deletes a search engine from the service at index |profile| with original
 // keyword |keyword|. Does the same to the verifier, if it is used.
-void DeleteSearchEngineByKeyword(int profile, const string16 keyword);
+void DeleteSearchEngineByKeyword(int profile, const string16& keyword);
 
 // Deletes a search engine from the service at index |profile| which was
 // generated by seed |seed|.