Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.

chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

 // Copyright 2013 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/extensions/api/feedback_private/feedback_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 24 matching lines @@
 
 namespace extensions {
 
 namespace feedback_private = api::feedback_private;
 
 using feedback_private::SystemInformation;
 using feedback_private::FeedbackInfo;
 
 char kFeedbackExtensionId[] = "gfdkimpbcpahaombhbimeihdjnejgicl";
 
-static base::LazyInstance<ProfileKeyedAPIFactory<FeedbackPrivateAPI> >
+static base::LazyInstance<BrowserContextKeyedAPIFactory<FeedbackPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
-ProfileKeyedAPIFactory<FeedbackPrivateAPI>*
-    FeedbackPrivateAPI::GetFactoryInstance() {
+BrowserContextKeyedAPIFactory<FeedbackPrivateAPI>*
+FeedbackPrivateAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 FeedbackPrivateAPI::FeedbackPrivateAPI(content::BrowserContext* context)
     : browser_context_(context), service_(FeedbackService::CreateInstance()) {}
 
 FeedbackPrivateAPI::~FeedbackPrivateAPI() {
   delete service_;
   service_ = NULL;
 }
@@ skipping 70 matching lines @@
 
   if (test_callback_ && !test_callback_->is_null())
     test_callback_->Run();
 
   return true;
 }
 
 bool FeedbackPrivateGetUserEmailFunction::RunImpl() {
   // TODO(rkc): Remove logging once crbug.com/284662 is closed.
   LOG(WARNING) << "FEEDBACK_DEBUG: User e-mail requested.";
-  FeedbackService* service = FeedbackPrivateAPI::GetFactoryInstance()
-                                 ->GetForProfile(GetProfile())
-                                 ->GetService();
+  FeedbackService* service =
+      FeedbackPrivateAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
   SetResult(new base::StringValue(service->GetUserEmail()));
   return true;
 }
 
 bool FeedbackPrivateGetSystemInformationFunction::RunImpl() {
   // TODO(rkc): Remove logging once crbug.com/284662 is closed.
   LOG(WARNING) << "FEEDBACK_DEBUG: System information requested.";
-  FeedbackService* service = FeedbackPrivateAPI::GetFactoryInstance()
-                                 ->GetForProfile(GetProfile())
-                                 ->GetService();
+  FeedbackService* service =
+      FeedbackPrivateAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
   service->GetSystemInformation(
       base::Bind(
           &FeedbackPrivateGetSystemInformationFunction::OnCompleted, this));
   return true;
 }
 
 void FeedbackPrivateGetSystemInformationFunction::OnCompleted(
     const SystemInformationList& sys_info) {
   results_ = feedback_private::GetSystemInformation::Results::Create(
@@ skipping 46 matching lines @@
   scoped_ptr<FeedbackData::SystemLogsMap> sys_logs(
       new FeedbackData::SystemLogsMap);
   SystemInformationList* sys_info = feedback_info.system_information.get();
   if (sys_info) {
     for (SystemInformationList::iterator it = sys_info->begin();
          it != sys_info->end(); ++it)
       (*sys_logs.get())[it->get()->key] = it->get()->value;
   }
   feedback_data->SetAndCompressSystemInfo(sys_logs.Pass());
 
-  FeedbackService* service = FeedbackPrivateAPI::GetFactoryInstance()
-                                 ->GetForProfile(GetProfile())
-                                 ->GetService();
+  FeedbackService* service =
+      FeedbackPrivateAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
 
   if (feedback_info.send_histograms) {
     scoped_ptr<std::string> histograms(new std::string);
     service->GetHistograms(histograms.get());
     if (!histograms->empty())
       feedback_data->SetAndCompressHistograms(histograms.Pass());
   }
 
   service->SendFeedback(
       GetProfile(),
       feedback_data,
       base::Bind(&FeedbackPrivateSendFeedbackFunction::OnCompleted, this));
 
   return true;
 }
 
 void FeedbackPrivateSendFeedbackFunction::OnCompleted(
     bool success) {
   results_ = feedback_private::SendFeedback::Results::Create(
       success ? feedback_private::STATUS_SUCCESS :
                 feedback_private::STATUS_DELAYED);
   SendResponse(true);
 }
 
 }  // namespace extensions