Remove GetExtensionService from Profile.

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 35 matching lines @@
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/intents/device_attached_intent_source.h"
 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
 #include "chrome/browser/intents/web_intents_reporting.h"
 #include "chrome/browser/intents/web_intents_util.h"
@@ skipping 1605 matching lines @@
     delete intents_dispatcher;
     return;
   }
 
   // Make sure the requester is coming from an extension/app page.
   // Internal dispatches set |web_contents| to NULL.
 #if !defined(OS_CHROMEOS)
   if (web_contents &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kWebIntentsInvocationEnabled)) {
-    ExtensionService* extensions_service = profile_->GetExtensionService();
+    ExtensionService* extensions_service =
+        extensions::ExtensionSystem::Get(profile_)->extension_service();
     if (!extensions_service ||
         extensions_service->extensions()->GetExtensionOrAppByURL(
             ExtensionURLInfo(web_contents->GetURL())) == NULL) {
       web_intents::RecordIntentsDispatchDisabled();
       intents_dispatcher->SendReplyMessage(
           webkit_glue::WEB_INTENT_REPLY_FAILURE,
           ASCIIToUTF16("Intents may only be invoked from extensions/apps."));
       return;
     }
   }
@@ skipping 586 matching lines @@
       BookmarkBar::ANIMATE_STATE_CHANGE :
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
   window_->BookmarkBarStateChanged(animate_type);
 }
 
 bool Browser::MaybeCreateBackgroundContents(int route_id,
                                             WebContents* opener_web_contents,
                                             const string16& frame_name,
                                             const GURL& target_url) {
   GURL opener_url = opener_web_contents->GetURL();
-  ExtensionService* extensions_service = profile_->GetExtensionService();
+  ExtensionService* extensions_service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
 
   if (!opener_url.is_valid() ||
       frame_name.empty() ||
       !extensions_service ||
       !extensions_service->is_ready())
     return false;
 
   // Only hosted apps have web extents, so this ensures that only hosted apps
   // can create BackgroundContents. We don't have to check for background
   // permission as that is checked in RenderMessageFilter when the CreateWindow
@@ skipping 54 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }