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

Unified Diff: content/shell/android/shell_library_loader.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 | « content/app/content_main_runner.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/shell_library_loader.cc
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index 3b6757eaf10bad7ac1aee9e321990fd40cdf680e..68cbf93413edd2ab31f8835eb47445e98d182090 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -33,16 +33,8 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
// browser process initialization gets checked in.
ShellMainDelegate* delegate = new ShellMainDelegate();
- // We use a ShellContentClient, created as a member of
- // ShellMainDelegate and set with a call to
- // content::SetContentClient() in PreSandboxStartup().
- // That must be done before ContentMainRunner::Initialize().
- // TODO(jrg): resolve the upstream/downstream discrepancy; we
- // shouldn't need to do this.
- delegate->PreSandboxStartup();
-
// TODO(jrg): find command line info from java; pass down in here.
- g_content_main_runner->Initialize(0, NULL, NULL);
+ g_content_main_runner->Initialize(0, NULL, delegate);
base::android::InitVM(vm);
JNIEnv* env = base::android::AttachCurrentThread();
« no previous file with comments | « content/app/content_main_runner.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698