Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.

chrome/browser/extensions/api/audio/audio_api.cc

 // Copyright (c) 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/audio/audio_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/audio.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 
 namespace extensions {
 
 namespace audio = api::audio;
 
-static base::LazyInstance<ProfileKeyedAPIFactory<AudioAPI> >
-g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<BrowserContextKeyedAPIFactory<AudioAPI> > g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
 // static
-ProfileKeyedAPIFactory<AudioAPI>* AudioAPI::GetFactoryInstance() {
+BrowserContextKeyedAPIFactory<AudioAPI>* AudioAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 AudioAPI::AudioAPI(content::BrowserContext* context)
     : browser_context_(context), service_(AudioService::CreateInstance()) {
   service_->AddObserver(this);
 }
 
 AudioAPI::~AudioAPI() {
   service_->RemoveObserver(this);
@@ skipping 11 matching lines @@
     scoped_ptr<Event> event(new Event(
         audio::OnDeviceChanged::kEventName,
         scoped_ptr<base::ListValue>(new base::ListValue())));
     ExtensionSystem::Get(browser_context_)->event_router()->BroadcastEvent(
         event.Pass());
   }
 }
 
 bool AudioGetInfoFunction::RunImpl() {
   AudioService* service =
-      AudioAPI::GetFactoryInstance()->GetForProfile(GetProfile())->GetService();
+      AudioAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
   service->StartGetInfo(base::Bind(&AudioGetInfoFunction::OnGetInfoCompleted,
                                    this));
   return true;
 }
 
 void AudioGetInfoFunction::OnGetInfoCompleted(const OutputInfo& output_info,
                                               const InputInfo& input_info,
                                               bool success) {
   if (success)
     results_ = api::audio::GetInfo::Results::Create(output_info, input_info);
   else
     SetError("Error occurred when querying audio device information.");
   SendResponse(success);
 }
 
 bool AudioSetActiveDevicesFunction::RunImpl() {
   scoped_ptr<api::audio::SetActiveDevices::Params> params(
       api::audio::SetActiveDevices::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   AudioService* service =
-      AudioAPI::GetFactoryInstance()->GetForProfile(GetProfile())->GetService();
+      AudioAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
 
   service->SetActiveDevices(params->ids);
   return true;
 }
 
 bool AudioSetPropertiesFunction::RunImpl() {
   scoped_ptr<api::audio::SetProperties::Params> params(
       api::audio::SetProperties::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   AudioService* service =
-      AudioAPI::GetFactoryInstance()->GetForProfile(GetProfile())->GetService();
+      AudioAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
   DCHECK(service);
 
   int volume_value = params->properties.volume.get() ?
       *params->properties.volume : -1;
 
   int gain_value = params->properties.gain.get() ?
       *params->properties.gain : -1;
 
   if (!service->SetDeviceProperties(params->id,
                                     params->properties.is_muted,
                                     volume_value,
                                     gain_value))
     return false;
   else
     return true;
 }
 
 }  // namespace extensions