| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 9a13fddc15158e7b23019347f2aeef15e3074a59..7212e1a02f883045d5364f4855a73c196300eb2e 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -29,7 +29,6 @@
|
| #include "chrome/browser/bookmarks/bookmark_extension_api.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chrome_plugin_service_filter.h"
|
| -#include "chrome/browser/extensions/api/api_resource_controller.h"
|
| #include "chrome/browser/extensions/api/cookies/cookies_api.h"
|
| #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
|
| #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
|
| @@ -344,7 +343,6 @@ ExtensionService::ExtensionService(Profile* profile,
|
| app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
|
| extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
|
| extension_warnings_(profile),
|
| - api_resource_controller_(NULL),
|
| app_shortcut_manager_(profile) {
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| @@ -2555,18 +2553,3 @@ ExtensionService::NaClModuleInfoList::iterator
|
| }
|
| return nacl_module_list_.end();
|
| }
|
| -
|
| -extensions::APIResourceController*
|
| -ExtensionService::api_resource_controller() {
|
| - // TODO(miket): Find a better place for this thing to live. Like every other
|
| - // piece of baggage on ExtensionService, it's scoped along with a Profile.
|
| -
|
| - // To coexist with certain unit tests that don't have a work-thread message
|
| - // loop available at ExtensionService shutdown, we lazy-initialize this
|
| - // object so that those cases neither create nor destroy an
|
| - // APIResourceController.
|
| - if (!api_resource_controller_.get()) {
|
| - api_resource_controller_.reset(new extensions::APIResourceController());
|
| - }
|
| - return api_resource_controller_.get();
|
| -}
|
|
|