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

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>
 
+#include "base/string16.h"
+
 class TemplateURL;
 class TemplateURLService;
 
 typedef std::map<std::string, const TemplateURL*> GUIDToTURLMap;
 
 namespace search_engines_helper {
 
 // Used to access the search engines within a particular sync profile.
 TemplateURLService* GetServiceForProfile(int index);
 
@@ skipping 30 matching lines @@
 // 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 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 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_