| Index: content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
|
| index e6040ee0b93cf46e721d6d0f2b5f615962f246d4..818473818ce24e78c2258fc5bf163327768f92fa 100644
|
| --- a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
|
| +++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
|
| @@ -28,7 +28,6 @@ import org.chromium.base.library_loader.Linker;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.content.browser.ChildProcessConstants;
|
| import org.chromium.content.browser.ChildProcessCreationParams;
|
| -import org.chromium.content.common.ContentSwitches;
|
| import org.chromium.content.common.FileDescriptorInfo;
|
| import org.chromium.content.common.IChildProcessCallback;
|
| import org.chromium.content.common.IChildProcessService;
|
| @@ -49,7 +48,6 @@ import java.util.concurrent.atomic.AtomicReference;
|
| public class ChildProcessServiceImpl {
|
| private static final String MAIN_THREAD_NAME = "ChildProcessMain";
|
| private static final String TAG = "ChildProcessService";
|
| - protected static final FileDescriptorInfo[] EMPTY_FILE_DESCRIPTOR_INFO = {};
|
| private IChildProcessCallback mCallback;
|
|
|
| // This is the native "Main" thread for the renderer / utility process.
|
| @@ -312,11 +310,6 @@ public class ChildProcessServiceImpl {
|
| // http://stackoverflow.com/questions/8745893/i-dont-get-why-this-classcastexception-occurs
|
| mFdInfos = new FileDescriptorInfo[fdInfosAsParcelable.length];
|
| System.arraycopy(fdInfosAsParcelable, 0, mFdInfos, 0, fdInfosAsParcelable.length);
|
| - } else {
|
| - String processType = ContentSwitches.getSwitchValue(
|
| - mCommandLineParams, ContentSwitches.SWITCH_PROCESS_TYPE);
|
| - assert ContentSwitches.SWITCH_DOWNLOAD_PROCESS.equals(processType);
|
| - mFdInfos = EMPTY_FILE_DESCRIPTOR_INFO;
|
| }
|
| Bundle sharedRelros = bundle.getBundle(Linker.EXTRA_LINKER_SHARED_RELROS);
|
| if (sharedRelros != null) {
|
|
|