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

Unified Diff: apps/shell/shell_browser_context.cc

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
« no previous file with comments | « no previous file | apps/shell/shell_browser_main_parts.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/shell_browser_context.cc
diff --git a/apps/shell/shell_browser_context.cc b/apps/shell/shell_browser_context.cc
index 31a272b4e6ac7eb95a231e236bc7089e1e8c9031..77aa96f8ee94f1503c3420fd988678917bc102a3 100644
--- a/apps/shell/shell_browser_context.cc
+++ b/apps/shell/shell_browser_context.cc
@@ -4,25 +4,14 @@
#include "apps/shell/shell_browser_context.h"
-#include "apps/app_load_service_factory.h"
-
-namespace {
-
-// See ChromeBrowserMainExtraPartsProfiles for details.
-void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
- apps::AppLoadServiceFactory::GetInstance();
-}
-
-} // namespace
-
namespace apps {
-// TODO(jamescook): Should this be an off-the-record context?
-// TODO(jamescook): Could initialize NetLog here to get logs from the networking
-// stack.
+// Create a normal recording browser context. If we used an incognito context
+// then app_shell would also have to create a normal context and manage both.
ShellBrowserContext::ShellBrowserContext()
: content::ShellBrowserContext(false, NULL) {
- EnsureBrowserContextKeyedServiceFactoriesBuilt();
+ // TODO(jamescook): Could initialize NetLog here to get logs from the
+ // networking stack.
}
ShellBrowserContext::~ShellBrowserContext() {
« no previous file with comments | « no previous file | apps/shell/shell_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698