diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 06:42:27 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 06:42:27 +0000 |
| commit | 9cf1c2d4f2285402a744d30d3761d7284e5d367d (patch) | |
| tree | 01d0c4793bcfa3bd29d2e7a492d4451d85626d98 /chrome/browser/extensions/extension_service.h | |
| parent | 96277f35f0438f59bf1155dc8431e07037bb9159 (diff) | |
| download | chromium_src-9cf1c2d4f2285402a744d30d3761d7284e5d367d.zip chromium_src-9cf1c2d4f2285402a744d30d3761d7284e5d367d.tar.gz chromium_src-9cf1c2d4f2285402a744d30d3761d7284e5d367d.tar.bz2 | |
Revert 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem.
This may be causing this crash:
Note: Google Test filter = PrerenderBrowserTest.PrerenderUnload
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from PrerenderBrowserTest, where TypeParam =
[ RUN ] PrerenderBrowserTest.PrerenderUnload
[2464:2324:0302/211059:6709843:FATAL:profile_dependency_manager.cc(134)] Check failed: false. Attempted to access a Profile that was ShutDown(). This is most likely a heap smasher in progress. After ProfileKeyedService::Shutdown() completes, your service MUST NOT refer to depended Profile services again.
Move InitExtensions into ExtensionSystem.
Remove a few accessors (ExtensionDevToolsManager, ExtensionMessageService). The others have too many callers to fix in one go.
BUG=104095
TEST=Open and close an incognito window; should not crash.
Review URL: http://codereview.chromium.org/9369013
TBR=yoz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9583036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.h')
| -rw-r--r-- | chrome/browser/extensions/extension_service.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index f7e02be..c090504 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -58,7 +58,6 @@ class ExtensionGlobalError; class ExtensionManagementEventRouter; class ExtensionPreferenceEventRouter; class ExtensionSyncData; -class ExtensionSystem; class ExtensionToolbarModel; class ExtensionUpdater; class ExtensionWebNavigationEventRouter; @@ -707,12 +706,9 @@ class ExtensionService NaClModuleInfoList::iterator FindNaClModule(const GURL& url); - // The normal profile associated with this ExtensionService. + // The profile this ExtensionService is part of. Profile* profile_; - // The ExtensionSystem for the profile above. - ExtensionSystem* system_; - // Preferences for the owning profile (weak reference). ExtensionPrefs* extension_prefs_; |