Add four new sync integration tests for custom search engines.

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

Index: chrome/browser/sync/test/integration/search_engines_helper.h
diff --git a/chrome/browser/sync/test/integration/search_engines_helper.h b/chrome/browser/sync/test/integration/search_engines_helper.h
index 48582803e5e4c3525df3291ab9e78869cc1094a6..15147744ae3652d52328ecb3f4190239219e2173 100644
--- a/chrome/browser/sync/test/integration/search_engines_helper.h
+++ b/chrome/browser/sync/test/integration/search_engines_helper.h
@@ -52,6 +52,7 @@ 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. If profile -1 is specified, this only affects the

[Raghu Simha, 2011/11/16 01:14:41]

All these changes involving |profile| == -1 might be unnecessary if you call
DisableVerifier() prior to tests that involve conflicts. See my comment in
two_client_search_engines_sync_test.cc.

[SteveT, 2011/11/16 15:43:32]

Removed all these comments.

 // verifier, if it is used.
 void EditSearchEngine(int profile,
                       const std::string& keyword,
@@ -60,15 +61,18 @@ void EditSearchEngine(int profile,
                       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.
+// keyword |keyword|. Does the same to the verifier, if it is used. If profile
+// -1 is specified, this only affects the verifier, if it is used.
 void DeleteSearchEngineByKeyword(int profile, const string16 keyword);
 
 // Deletes a search engine from the service at index |profile| which was
-// generated by seed |seed|.
+// generated by seed |seed|. If profile -1 is specified, this only affects the
+// verifier, if it is used.
 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.
+// to be the new default. Does the same to the verifier, if it is used. If
+// profile -1 is specified, this only affects the verifier, if it is used.
 void ChangeDefaultSearchProvider(int profile, int seed);
 
 }  // namespace search_engines_helper