| Index: chrome/browser/extensions/extensions_service.h
|
| diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
|
| index c8310392643e35d80b1080ea538ff231283f4a68..8a527621707b72db6fb1ed063f62018df5c58f44 100644
|
| --- a/chrome/browser/extensions/extensions_service.h
|
| +++ b/chrome/browser/extensions/extensions_service.h
|
| @@ -148,9 +148,12 @@ class ExtensionsService
|
| static bool UninstallExtensionHelper(ExtensionsService* extensions_service,
|
| const std::string& extension_id);
|
|
|
| + // Constructor stores pointers to |profile| and |extension_prefs| but
|
| + // ownership remains at caller.
|
| ExtensionsService(Profile* profile,
|
| const CommandLine* command_line,
|
| const FilePath& install_directory,
|
| + ExtensionPrefs* extension_prefs,
|
| bool autoupdate_enabled);
|
|
|
| // Gets the list of currently installed extensions.
|
| @@ -402,7 +405,7 @@ class ExtensionsService
|
| // it.
|
| void DestroyingProfile();
|
|
|
| - ExtensionPrefs* extension_prefs() { return extension_prefs_.get(); }
|
| + ExtensionPrefs* extension_prefs() { return extension_prefs_; }
|
|
|
| // Whether the extension service is ready.
|
| // TODO(skerner): Get rid of this method. crbug.com/63756
|
| @@ -505,8 +508,8 @@ class ExtensionsService
|
| // The profile this ExtensionsService is part of.
|
| Profile* profile_;
|
|
|
| - // Preferences for the owning profile.
|
| - scoped_ptr<ExtensionPrefs> extension_prefs_;
|
| + // Preferences for the owning profile (weak reference).
|
| + ExtensionPrefs* extension_prefs_;
|
|
|
| // The current list of installed extensions.
|
| ExtensionList extensions_;
|
|
|