Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit le…

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 132905)
+++ chrome/browser/sync/test/integration/search_engines_helper.h	(working copy)
@@ -11,6 +11,7 @@
 
 #include "base/string16.h"
 
+class Profile;
 class TemplateURL;
 class TemplateURLService;
 
@@ -19,64 +20,51 @@
 namespace search_engines_helper {
 
 // Used to access the search engines within a particular sync profile.
-TemplateURLService* GetServiceForProfile(int index);
+TemplateURLService* GetServiceForProfile(int profile_index);
 
 // Used to access the search engines within the verifier sync profile.
 TemplateURLService* GetVerifierService();
 
-// Returns a mapping of |service|'s TemplateURL collection with their sync
-// GUIDs as keys.
-GUIDToTURLMap CreateGUIDToTURLMap(TemplateURLService* service);
-
-// Returns true iff the major user-visible fields of |turl1| and |turl2| match.
-bool TURLsMatch(const TemplateURL* turl1, const TemplateURL* turl2);
-
 // Compared a single TemplateURLService for a given profile to the verifier.
 // Retrns true iff their user-visible fields match.
-bool ServiceMatchesVerifier(int profile);
+bool ServiceMatchesVerifier(int profile_index);
 
-// 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,
+TemplateURL* CreateTestTemplateURL(Profile* profile,
+                                   int seed,
                                    const string16& keyword,
                                    const std::string& sync_guid);
-TemplateURL* CreateTestTemplateURL(int seed,
+TemplateURL* CreateTestTemplateURL(Profile* profile,
+                                   int seed,
                                    const string16& keyword,
                                    const std::string& url,
                                    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);
+// Add a search engine based on a seed to the service at index |profile_index|
+// and the verifier if it is used.
+void AddSearchEngine(int profile_index, 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,
+// Retrieves a search engine from the service at index |profile_index| with
+// original keyword |keyword| and changes its user-visible fields. Does the same
+// to the verifier, if it is used.
+void EditSearchEngine(int profile_index,
                       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);
-
-// Deletes a search engine from the service at index |profile| which was
+// Deletes a search engine from the service at index |profile_index| which was
 // generated by seed |seed|.
-void DeleteSearchEngineBySeed(int profile, int seed);
+void DeleteSearchEngineBySeed(int profile_index, 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);
+// Change the search engine generated with |seed| in service at index
+// |profile_index| to be the new default. Does the same to the verifier, if it
+// is used.
+void ChangeDefaultSearchProvider(int profile_index, int seed);
 
 }  // namespace search_engines_helper