Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java |
index ba4cab822b0736583eac4ce39568d8912b56ded5..57fa13b663b5a5adadf7bf65e4725dae26aa3b76 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java |
@@ -765,13 +765,13 @@ public class ChildProcessLauncher { |
* @param linkerParams Linker params to start the service. |
*/ |
protected static Bundle createsServiceBundle( |
- String[] commandLine, FileDescriptorInfo[] filesToBeMapped, Bundle sharedRelros) { |
+ String[] commandLine, FileDescriptorInfo[] filesToBeMapped) { |
Bundle bundle = new Bundle(); |
bundle.putStringArray(ChildProcessConstants.EXTRA_COMMAND_LINE, commandLine); |
bundle.putParcelableArray(ChildProcessConstants.EXTRA_FILES, filesToBeMapped); |
bundle.putInt(ChildProcessConstants.EXTRA_CPU_COUNT, CpuFeatures.getCount()); |
bundle.putLong(ChildProcessConstants.EXTRA_CPU_FEATURES, CpuFeatures.getMask()); |
- bundle.putBundle(Linker.EXTRA_LINKER_SHARED_RELROS, sharedRelros); |
+ bundle.putBundle(Linker.EXTRA_LINKER_SHARED_RELROS, Linker.getInstance().getSharedRelros()); |
return bundle; |
} |
@@ -803,11 +803,8 @@ public class ChildProcessLauncher { |
}; |
assert callbackType != CALLBACK_FOR_UNKNOWN_PROCESS; |
- connection.setupConnection(commandLine, |
- filesToBeMapped, |
- createCallback(childProcessId, callbackType), |
- connectionCallback, |
- Linker.getInstance().getSharedRelros()); |
+ connection.setupConnection(commandLine, filesToBeMapped, |
+ createCallback(childProcessId, callbackType), connectionCallback); |
} |
/** |