From 9cf1c2d4f2285402a744d30d3761d7284e5d367d Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Sat, 3 Mar 2012 06:42:27 +0000 Subject: 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 --- chrome/browser/intents/web_intents_registry_factory.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chrome/browser/intents') diff --git a/chrome/browser/intents/web_intents_registry_factory.cc b/chrome/browser/intents/web_intents_registry_factory.cc index 94d869f..2b22286 100644 --- a/chrome/browser/intents/web_intents_registry_factory.cc +++ b/chrome/browser/intents/web_intents_registry_factory.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/intents/web_intents_registry_factory.h" #include "chrome/browser/profiles/profile.h" @@ -19,7 +18,7 @@ WebIntentsRegistryFactory::WebIntentsRegistryFactory() ProfileDependencyManager::GetInstance()) { // TODO(erg): For Shutdown() order, we need to: // DependsOn(WebDataServiceFactory::GetInstance()); - DependsOn(ExtensionSystemFactory::GetInstance()); + // DependsOn(ExtensionServiceFactory::GetInstance()); } WebIntentsRegistryFactory::~WebIntentsRegistryFactory() { -- cgit v1.1