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

Unified Diff: content/app/content_main_runner.cc

Issue 10388146: Fix crash in Android content_shell startup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | content/shell/android/shell_library_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 02d9b444ecc1c14fc9b28fb11bb4a201ebeb8ec6..d2a1b80fa370159a97815cd66ec438f8fcd0621b 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -488,12 +488,6 @@ static void ReleaseFreeMemoryThunk() {
ui::RegisterPathProvider();
content::RegisterPathProvider();
-
- // TODO(jrg): "up to here" is how far we get without crashing on
- // content shell bringup.
-#if defined(ANDROID_UPSTREAM_BRINGUP)
- return 0;
-#endif
content::RegisterContentSchemes(true);
CHECK(icu_util::Initialize());
« no previous file with comments | « no previous file | content/shell/android/shell_library_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698