Remove GetExtensionService from Profile.

chrome/browser/extensions/context_menu_matcher.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 "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/common/context_menu_params.h"
 #include "ui/gfx/favicon_size.h"
 
 namespace extensions {
 
 // static
 const size_t ContextMenuMatcher::kMaxExtensionItemTitleLength = 75;
 
 ContextMenuMatcher::ContextMenuMatcher(
     Profile* profile,
     ui::SimpleMenuModel::Delegate* delegate,
     ui::SimpleMenuModel* menu_model,
     const base::Callback<bool(const MenuItem*)>& filter)
     : profile_(profile), menu_model_(menu_model), delegate_(delegate),
       filter_(filter) {
 }
 
 void ContextMenuMatcher::AppendExtensionItems(const std::string& extension_id,
                                               const string16& selection_text,
                                               int* index)
 {
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   MenuManager* manager = service->menu_manager();
   const Extension* extension = service->GetExtensionById(extension_id, false);
   DCHECK_GE(*index, 0);
   int max_index =
       IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST - IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
   if (!extension || *index >= max_index)
     return;
 
   // Find matching items.
   const MenuItem::List* all_items = manager->MenuItems(extension_id);
@@ skipping 66 matching lines @@
 bool ContextMenuMatcher::IsCommandIdEnabled(int command_id) const {
   MenuItem* item = GetExtensionMenuItem(command_id);
   if (!item)
     return true;
   return item->enabled();
 }
 
 void ContextMenuMatcher::ExecuteCommand(int command_id,
     content::WebContents* web_contents,
     const content::ContextMenuParams& params) {
-  MenuManager* manager = profile_->GetExtensionService()->menu_manager();
+  MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
+      extension_service()->menu_manager();
   MenuItem* item = GetExtensionMenuItem(command_id);
   if (!item)
     return;
 
   manager->ExecuteCommand(profile_, web_contents, params, item->id());
 }
 
 MenuItem::List ContextMenuMatcher::GetRelevantExtensionItems(
     const MenuItem::List& items,
     bool can_cross_incognito) {
@@ skipping 68 matching lines @@
     } else if (item->type() == MenuItem::SEPARATOR) {
       if (i != items.begin() && last_type != MenuItem::SEPARATOR) {
         menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
       }
     }
     last_type = item->type();
   }
 }
 
 MenuItem* ContextMenuMatcher::GetExtensionMenuItem(int id) const {
-  MenuManager* manager = profile_->GetExtensionService()->menu_manager();
+  MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
+      extension_service()->menu_manager();
   std::map<int, MenuItem::Id>::const_iterator i =
       extension_item_map_.find(id);
   if (i != extension_item_map_.end()) {
     MenuItem* item = manager->GetItemById(i->second);
     if (item)
       return item;
   }
   return NULL;
 }
 
 void ContextMenuMatcher::SetExtensionIcon(const std::string& extension_id) {
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   MenuManager* menu_manager = service->menu_manager();
 
   int index = menu_model_->GetItemCount() - 1;
   DCHECK_GE(index, 0);
 
   const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id);
   DCHECK(icon.width() == gfx::kFaviconSize);
   DCHECK(icon.height() == gfx::kFaviconSize);
 
   menu_model_->SetIcon(index, gfx::Image(icon));
 }
 
 }  // namespace extensions