Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1230)

Unified Diff: chrome/browser/extensions/extension_system_factory.h

Issue 118043003: Fix app_shell shutdown crash due to BrowserContextKeyedServices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ScopedFactoryForTest (shutdown_crash) Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_system_factory.h
diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h
index 1f8a6530befdd5c3fb8aa53589701a51946c9407..280db7ae73b55750b03e42145f8a9adc0dba7f2e 100644
--- a/chrome/browser/extensions/extension_system_factory.h
+++ b/chrome/browser/extensions/extension_system_factory.h
@@ -44,10 +44,6 @@ class ExtensionSystemFactory : public BrowserContextKeyedServiceFactory {
static ExtensionSystemFactory* GetInstance();
- // Provides a custom ExtensionSystem to use instead of building a new
- // ExtensionSystemImpl. The BrowserContextKeyedService system takes ownership.
- void SetCustomInstance(ExtensionSystem* extension_system);
-
private:
friend struct DefaultSingletonTraits<ExtensionSystemFactory>;
@@ -59,8 +55,6 @@ class ExtensionSystemFactory : public BrowserContextKeyedServiceFactory {
virtual content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const OVERRIDE;
virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
-
- ExtensionSystem* custom_instance_; // Not owned.
};
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.cc ('k') | chrome/browser/extensions/extension_system_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698