Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

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 108905)
+++ chrome/browser/sync/test/integration/search_engines_helper.h	(working copy)
@@ -9,6 +9,8 @@
 #include <map>
 #include <string>
 
+#include "base/string16.h"
+
 class TemplateURL;
 class TemplateURLService;
 
@@ -59,8 +61,16 @@
 
 // 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 DeleteSearchEngine(int profile, const std::string& keyword);
+void DeleteSearchEngine(int profile, const string16 keyword);

[Raghu Simha, 2011/11/07 22:18:12]

Optional: Since you've added DeleteSearchEngineBySeed, do you want to call this
DeleteSearchEngineByKeyword?

[SteveT, 2011/11/08 00:17:27]

Sure, that's definitely more clear. Done here, in search_engines_helper.cc, and
in two_client_search_engines_sync_test.cc where this is used.

 
+// 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_