Remove GetExtensionService from Profile.

chrome/browser/ui/app_list/apps_model_builder.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/app_list/apps_model_builder.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
 
 namespace {
@@ skipping 15 matching lines @@
 }  // namespace
 
 AppsModelBuilder::AppsModelBuilder(Profile* profile,
                                    app_list::AppListModel::Apps* model,
                                    AppListControllerDelegate* controller)
     : profile_(profile),
       controller_(controller),
       model_(model),
       ignore_changes_(false) {
   extensions::ExtensionPrefs* extension_prefs =
-      profile_->GetExtensionService()->extension_prefs();
+      extensions::ExtensionSystem::Get(profile_)->extension_service()->
+          extension_prefs();
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
       content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
       content::Source<ExtensionSorting>(extension_prefs->extension_sorting()));
   registrar_.Add(this, chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,
       content::Source<Profile>(profile_));
 
   pref_change_registrar_.Init(extension_prefs->pref_service());
   pref_change_registrar_.Add(extensions::ExtensionPrefs::kExtensionsPref, this);
 
   model_->AddObserver(this);
 }
 
 AppsModelBuilder::~AppsModelBuilder() {
   model_->RemoveObserver(this);
 }
 
 void AppsModelBuilder::Build() {
   DCHECK(model_ && model_->item_count() == 0);
 
   PopulateApps();
   HighlightApp();
 }
 
 void AppsModelBuilder::PopulateApps() {
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (!service)
     return;
 
   Apps apps;
   const ExtensionSet* extensions = service->extensions();
   for (ExtensionSet::const_iterator app = extensions->begin();
        app != extensions->end(); ++app) {
     if ((*app)->ShouldDisplayInAppLauncher())
       apps.push_back(new ExtensionAppItem(profile_, *app, controller_));
   }
@@ skipping 142 matching lines @@
 
   ExtensionAppItem* prev = target_index > 0 ? GetAppAt(target_index - 1) : NULL;
   ExtensionAppItem* next = target_index + 1 < model_->item_count() ?
       GetAppAt(target_index + 1) : NULL;
   GetAppAt(target_index)->Move(prev, next);
 }
 
 void AppsModelBuilder::ListItemsChanged(size_t start, size_t count) {
   NOTREACHED();
 }