Remove profile-keyed factory boilerplates.

chrome/browser/ui/webui/extensions/command_handler.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/ui/webui/extensions/command_handler.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
-#include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 64 matching lines @@
   std::string command_name;
   std::string keystroke;
   if (!args->GetString(0, &extension_id) ||
       !args->GetString(1, &command_name) ||
       !args->GetString(2, &keystroke)) {
     NOTREACHED();
     return;
   }
 
   Profile* profile = Profile::FromWebUI(web_ui());
-  CommandService* command_service =
-      CommandServiceFactory::GetForProfile(profile);
+  CommandService* command_service = CommandService::Get(profile);
   command_service->UpdateKeybindingPrefs(extension_id, command_name, keystroke);
 
   UpdateCommandDataOnPage();
 }
 
 void CommandHandler::HandleSetShortcutHandlingSuspended(const ListValue* args) {
   bool suspended;
   if (args->GetBoolean(0, &suspended))
     ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(suspended);
 }
 
 void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
   ListValue* results = new ListValue;
 
   Profile* profile = Profile::FromWebUI(web_ui());
-  CommandService* command_service =
-      CommandServiceFactory::GetForProfile(profile);
+  CommandService* command_service = CommandService::Get(profile);
 
   const ExtensionSet* extensions = extensions::ExtensionSystem::Get(profile)->
       extension_service()->extensions();
   for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     scoped_ptr<DictionaryValue> extension_dict(new DictionaryValue);
     extension_dict->SetString("name", (*extension)->name());
     extension_dict->SetString("id", (*extension)->id());
 
     // Add the keybindings to a list structure.
@@ skipping 43 matching lines @@
     if (!extensions_list->empty()) {
       extension_dict->Set("commands", extensions_list.release());
       results->Append(extension_dict.release());
     }
   }
 
   commands->Set("commands", results);
 }
 
 }  // namespace extensions