ExtensionSystem cleanup part 3

chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc

 // Copyright 2014 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_diagnosis_runner.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
 
 namespace chromeos {
 
 class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory {
  public:
   static KioskDiagnosisRunner* GetForProfile(Profile* profile) {
     return static_cast<KioskDiagnosisRunner*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
 
   static Factory* GetInstance() {
     return Singleton<Factory>::get();
   }
 
  private:
   friend struct DefaultSingletonTraits<Factory>;
 
   Factory()
       : BrowserContextKeyedServiceFactory(
             "KioskDiagnosisRunner",
             BrowserContextDependencyManager::GetInstance()) {
-    DependsOn(extensions::ExtensionSystemFactory::GetInstance());
+    DependsOn(extensions::ExtensionsBrowserClient::Get()
+                  ->GetExtensionSystemFactory());
     DependsOn(extensions::FeedbackPrivateAPI::GetFactoryInstance());
   }
 
   virtual ~Factory() {}
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual BrowserContextKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const OVERRIDE {
     Profile* profile = static_cast<Profile*>(context);
     return new KioskDiagnosisRunner(profile);
@@ skipping 66 matching lines @@
                         feedback_data,
                         base::Bind(&KioskDiagnosisRunner::OnFeedbackSent,
                                    weak_factory_.GetWeakPtr()));
 }
 
 void KioskDiagnosisRunner::OnFeedbackSent(bool) {
   // Do nothing.
 }
 
 }  // namespace chromeos