ExtensionSystem cleanup part 3

chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

 // Copyright 2013 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/chromeos/app_mode/kiosk_app_update_service.h"
 
 #include "base/logging.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 
 namespace chromeos {
 
 namespace {
 
 // How low to wait after an update is available before we force a restart.
 const int kForceRestartWaitTimeMs = 24 * 3600 * 1000;  // 24 hours.
 
 }  // namespace
@@ skipping 79 matching lines @@
 
 void KioskAppUpdateService::WillDestroyAutomaticRebootManager() {
   automatic_reboot_manager_->RemoveObserver(this);
   automatic_reboot_manager_ = NULL;
 }
 
 KioskAppUpdateServiceFactory::KioskAppUpdateServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "KioskAppUpdateService",
         BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
+  DependsOn(
+      extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
 KioskAppUpdateServiceFactory::~KioskAppUpdateServiceFactory() {
 }
 
 // static
 KioskAppUpdateService* KioskAppUpdateServiceFactory::GetForProfile(
     Profile* profile) {
   // This should never be called unless we are running in forced app mode.
   DCHECK(chrome::IsRunningInForcedAppMode());
@@ skipping 11 matching lines @@
 
 BrowserContextKeyedService*
 KioskAppUpdateServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return new KioskAppUpdateService(
       Profile::FromBrowserContext(context),
       g_browser_process->platform_part()->automatic_reboot_manager());
 }
 
 }  // namespace chromeos