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(); |