Add four new sync integration tests for custom search engines.

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 34 matching lines @@
 // Create a TemplateURL with some test values based on |seed|. The caller owns
 // the returned TemplateURL*.
 TemplateURL* CreateTestTemplateURL(int seed);
 
 // 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. 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,
                       const std::string& short_name,
                       const std::string& 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.
+// 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
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_