Split extensions::MenuManager instance out from ExtensionService.

chrome/browser/extensions/api/context_menus/context_menus_api.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/extensions/api/context_menus/context_menus_api.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/context_menus.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/url_pattern_set.h"
 
 using extensions::ErrorUtils;
 
 namespace {
@@ skipping 146 matching lines @@
     base::DictionaryValue* properties = NULL;
     EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &properties));
     EXTENSION_FUNCTION_VALIDATE(properties->GetInteger(kGeneratedIdKey,
                                                        &id.uid));
   }
 
   std::string title;
   if (params->create_properties.title.get())
     title = *params->create_properties.title;
 
-  MenuManager* menu_manager =
-      GetProfile()->GetExtensionService()->menu_manager();
+  MenuManager* menu_manager = MenuManager::Get(GetProfile());
 
   if (menu_manager->GetItemById(id)) {
     error_ = ErrorUtils::FormatErrorMessage(kDuplicateIDError,
                                                      GetIDString(id));
     return false;
   }
 
   if (BackgroundInfo::HasLazyBackgroundPage(GetExtension()) &&
       params->create_properties.onclick.get()) {
     error_ = kOnclickDisallowedError;
@@ skipping 63 matching lines @@
   scoped_ptr<Update::Params> params(Update::Params::Create(*args_));
 
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->id.as_string)
     item_id.string_uid = *params->id.as_string;
   else if (params->id.as_integer)
     item_id.uid = *params->id.as_integer;
   else
     NOTREACHED();
 
-  ExtensionService* service = GetProfile()->GetExtensionService();
-  MenuManager* manager = service->menu_manager();
+  MenuManager* manager = MenuManager::Get(GetProfile());
   MenuItem* item = manager->GetItemById(item_id);
   if (!item || item->extension_id() != extension_id()) {
     error_ = ErrorUtils::FormatErrorMessage(
         kCannotFindItemError, GetIDString(item_id));
     return false;
   }
 
   // Type.
   MenuItem::Type type = GetType(params->update_properties, item->type());
 
@@ skipping 74 matching lines @@
     return false;
 
   manager->WriteToStorage(GetExtension());
   return true;
 }
 
 bool ContextMenusRemoveFunction::RunImpl() {
   scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  ExtensionService* service = GetProfile()->GetExtensionService();
-  MenuManager* manager = service->menu_manager();
+  MenuManager* manager = MenuManager::Get(GetProfile());
 
   MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
   if (params->menu_item_id.as_string)
     id.string_uid = *params->menu_item_id.as_string;
   else if (params->menu_item_id.as_integer)
     id.uid = *params->menu_item_id.as_integer;
   else
     NOTREACHED();
 
   MenuItem* item = manager->GetItemById(id);
   // Ensure one extension can't remove another's menu items.
   if (!item || item->extension_id() != extension_id()) {
     error_ = ErrorUtils::FormatErrorMessage(
         kCannotFindItemError, GetIDString(id));
     return false;
   }
 
   if (!manager->RemoveContextMenuItem(id))
     return false;
   manager->WriteToStorage(GetExtension());
   return true;
 }
 
 bool ContextMenusRemoveAllFunction::RunImpl() {
-  ExtensionService* service = GetProfile()->GetExtensionService();
-  MenuManager* manager = service->menu_manager();
+  MenuManager* manager = MenuManager::Get(GetProfile());
   manager->RemoveAllContextItems(GetExtension()->id());
   manager->WriteToStorage(GetExtension());
   return true;
 }
 
 }  // namespace extensions