Remove references to Profile from browser_context_keyed_service.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 43 matching lines @@
   if (!result) {
     LOG(ERROR) << "TemplateURLs did not match: " << GetTURLInfoString(turl1)
                << " vs " << GetTURLInfoString(turl2);
   }
 
   return result;
 }
 
 bool ServicesMatch(int profile_a, int profile_b) {
   TemplateURLService* service_a =
-      search_engines_helper::GetServiceForProfile(profile_a);
+      search_engines_helper::GetServiceForBrowserContext(profile_a);
   TemplateURLService* service_b =
-      search_engines_helper::GetServiceForProfile(profile_b);
+      search_engines_helper::GetServiceForBrowserContext(profile_b);
   CHECK(service_a);
   CHECK(service_b);
 
   // Services that have synced should have identical TURLs, including the GUIDs.
   // Make sure we compare those fields in addition to the user-visible fields.
   GUIDToTURLMap a_turls = CreateGUIDToTURLMap(service_a);
   GUIDToTURLMap b_turls = CreateGUIDToTURLMap(service_b);
 
   if (a_turls.size() != b_turls.size()) {
     LOG(ERROR) << "Service a and b do not match in size: " << a_turls.size()
@@ skipping 31 matching lines @@
 // Convenience helper for consistently generating the same keyword for a given
 // seed.
 string16 CreateKeyword(int seed) {
   return ASCIIToUTF16(base::StringPrintf("test%d", seed));
 }
 
 }  // namespace
 
 namespace search_engines_helper {
 
-TemplateURLService* GetServiceForProfile(int profile_index) {
+TemplateURLService* GetServiceForBrowserContext(int profile_index) {
   return TemplateURLServiceFactory::GetForProfile(
       test()->GetProfile(profile_index));
 }
 
 TemplateURLService* GetVerifierService() {
   return TemplateURLServiceFactory::GetForProfile(test()->verifier());
 }
 
 bool ServiceMatchesVerifier(int profile_index) {
   TemplateURLService* verifier = GetVerifierService();
-  TemplateURLService* other = GetServiceForProfile(profile_index);
+  TemplateURLService* other = GetServiceForBrowserContext(profile_index);
 
   CHECK(verifier);
   CHECK(other);
 
   TemplateURLService::TemplateURLVector verifier_turls =
       verifier->GetTemplateURLs();
   if (verifier_turls.size() != other->GetTemplateURLs().size()) {
     LOG(ERROR) << "Verifier and other service have a different count of TURLs: "
                << verifier_turls.size() << " vs "
                << other->GetTemplateURLs().size() << " respectively.";
@@ skipping 73 matching lines @@
   if (test()->use_verifier())
     GetVerifierService()->Add(CreateTestTemplateURL(profile, seed));
 }
 
 void EditSearchEngine(int profile_index,
                       const string16& keyword,
                       const string16& short_name,
                       const string16& new_keyword,
                       const std::string& url) {
   DCHECK(!url.empty());
-  TemplateURLService* service = GetServiceForProfile(profile_index);
+  TemplateURLService* service = GetServiceForBrowserContext(profile_index);
   TemplateURL* turl = service->GetTemplateURLForKeyword(keyword);
   EXPECT_TRUE(turl);
   ASSERT_FALSE(new_keyword.empty());
   service->ResetTemplateURL(turl, short_name, new_keyword, url);
   // Make sure we do the same on the verifier.
   if (test()->use_verifier()) {
     TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(keyword);
     EXPECT_TRUE(verifier_turl);
     GetVerifierService()->ResetTemplateURL(verifier_turl, short_name,
                                            new_keyword, url);
   }
 }
 
 void DeleteSearchEngineBySeed(int profile_index, int seed) {
-  TemplateURLService* service = GetServiceForProfile(profile_index);
+  TemplateURLService* service = GetServiceForBrowserContext(profile_index);
   string16 keyword(CreateKeyword(seed));
   TemplateURL* turl = service->GetTemplateURLForKeyword(keyword);
   EXPECT_TRUE(turl);
   service->Remove(turl);
   // Make sure we do the same on the verifier.
   if (test()->use_verifier()) {
     TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(keyword);
     EXPECT_TRUE(verifier_turl);
     GetVerifierService()->Remove(verifier_turl);
   }
 }
 
 void ChangeDefaultSearchProvider(int profile_index, int seed) {
-  TemplateURLService* service = GetServiceForProfile(profile_index);
+  TemplateURLService* service = GetServiceForBrowserContext(profile_index);
   ASSERT_TRUE(service);
   TemplateURL* turl = service->GetTemplateURLForKeyword(CreateKeyword(seed));
   ASSERT_TRUE(turl);
   service->SetDefaultSearchProvider(turl);
   if (test()->use_verifier()) {
     TemplateURL* verifier_turl =
         GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed));
     ASSERT_TRUE(verifier_turl);
     GetVerifierService()->SetDefaultSearchProvider(verifier_turl);
   }
 }
 
 }  // namespace search_engines_helper