| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index d8e601beb50ac115f6528daf73bf231b02b4ae96..572812606be8ee8921c0cbc8297a0d67d55d5ee9 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -341,10 +341,6 @@ ExtensionService::ExtensionService(Profile* profile,
|
| install_directory_.value().length(), 0, 500, 100);
|
| }
|
|
|
| -const ExtensionSet* ExtensionService::extensions() const {
|
| - return ®istry_->enabled_extensions();
|
| -}
|
| -
|
| extensions::PendingExtensionManager*
|
| ExtensionService::pending_extension_manager() {
|
| return &pending_extension_manager_;
|
| @@ -1918,7 +1914,7 @@ void ExtensionService::RegisterContentSettings(
|
| host_content_settings_map->RegisterProvider(
|
| HostContentSettingsMap::INTERNAL_EXTENSION_PROVIDER,
|
| scoped_ptr<content_settings::ObservableProvider>(
|
| - new content_settings::InternalExtensionProvider(this)));
|
| + new content_settings::InternalExtensionProvider(profile_)));
|
|
|
| host_content_settings_map->RegisterProvider(
|
| HostContentSettingsMap::CUSTOM_EXTENSION_PROVIDER,
|
|
|