Clean up some sync integration test code.

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

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 27 matching lines @@
 // Returns true iff |other|'s TemplateURLs matches the verifier's TemplateURLs
 // by sync GUIDs and user-visible fields.
 bool ServicesMatch(TemplateURLService* other);
 
 // Returns true iff all TemplateURLServices match with the verifier.
 bool AllServicesMatch();
 
 // 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.
 void AddSearchEngine(int profile, int seed);
 
 // Retrieves a search engine from the service at index |profile| with original
 // 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|.
 void DeleteSearchEngineBySeed(int profile, int seed);
 
 // Change the search engine generated with |seed| in service at index |profile|
 // to be the new default. Does the same to the verifier, if it is used.
 void ChangeDefaultSearchProvider(int profile, int seed);
 
 }  // namespace search_engines_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_