Revert of Fix HidService lifetime issues.

extensions/shell/browser/shell_extensions_browser_client.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 "extensions/shell/browser/shell_extensions_browser_client.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
-#include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/generated_api_registration.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
-#include "extensions/common/api/generated_api.h"
 #include "extensions/shell/browser/api/generated_api_registration.h"
+#include "extensions/shell/browser/api/shell_extensions_api_client.h"
 #include "extensions/shell/browser/shell_app_sorting.h"
 #include "extensions/shell/browser/shell_extension_host_delegate.h"
 #include "extensions/shell/browser/shell_extension_system_factory.h"
 #include "extensions/shell/browser/shell_runtime_api_delegate.h"
 
 using content::BrowserContext;
 
 namespace extensions {
 namespace {
 
 // See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc
 void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) {
   ExtensionPrefs::RegisterProfilePrefs(registry);
 }
 
 }  // namespace
 
 ShellExtensionsBrowserClient::ShellExtensionsBrowserClient(
     BrowserContext* context)
-    : browser_context_(context), api_client_(new ExtensionsAPIClient) {
+    : browser_context_(context), api_client_(new ShellExtensionsAPIClient) {
   // Set up the preferences service.
   base::PrefServiceFactory factory;
   factory.set_user_prefs(new TestingPrefStore);
   factory.set_extension_prefs(new TestingPrefStore);
   // app_shell should not require syncable preferences, but for now we need to
   // recycle some of the RegisterProfilePrefs() code in Chrome.
   // TODO(jamescook): Convert this to PrefRegistrySimple.
   user_prefs::PrefRegistrySyncable* pref_registry =
       new user_prefs::PrefRegistrySyncable;
   // Prefs should be registered before the PrefService is created.
@@ skipping 146 matching lines @@
 ComponentExtensionResourceManager*
 ShellExtensionsBrowserClient::GetComponentExtensionResourceManager() {
   return NULL;
 }
 
 net::NetLog* ShellExtensionsBrowserClient::GetNetLog() {
   return NULL;
 }
 
 }  // namespace extensions