Close leaking FDs.

content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java

Index: content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
index e6376b80f1edc19fff66e6f391330f79f533346e..f916185adb0f0f0ab68fda9abb6c00cb708222e8 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java
@@ -227,30 +227,32 @@ public class SandboxedProcessConnection implements ServiceConnection {
             int[] idsAndFds = mConnectionParams.mExtraFileIdsAndFds;
             assert idsAndFds.length % 2 == 0;
             int pairLength = idsAndFds.length / 2;
+            ParcelFileDescriptor[] parcelFiles = new ParcelFileDescriptor[pairLength];
             for (int i = 0; i < pairLength; i++) {
                 String idName = EXTRA_FILES_PREFIX + i + EXTRA_FILES_ID_SUFFIX;
                 String fdName = EXTRA_FILES_PREFIX + i + EXTRA_FILES_FD_SUFFIX;
-                ParcelFileDescriptor parcelFile;
-                try {
-                    parcelFile = ParcelFileDescriptor.fromFd(idsAndFds[(2 * i) + 1]);
-                    bundle.putParcelable(fdName, parcelFile);
-                    bundle.putInt(idName, idsAndFds[2 * i]);
-                } catch (IOException e) {
-                    Log.e(TAG, "Invalid extra file FD: id=" + idsAndFds[ 2 * i] + " fd="
-                          + idsAndFds[(2 * i) + 1]);
-                }
+                parcelFiles[i] = ParcelFileDescriptor.adoptFd(idsAndFds[(2 * i) + 1]);
+                bundle.putParcelable(fdName, parcelFiles[i]);
+                bundle.putInt(idName, idsAndFds[2 * i]);
             }
             try {
                 mPID = mService.setupConnection(bundle, mConnectionParams.mCallback);
             } catch (android.os.RemoteException re) {
                 Log.e(TAG, "Failed to setup connection.", re);
             }
+            // We proactivley close the FDs rather than wait for GC & finalizer.
             try {
-                // We proactivley close now rather than wait for GC & finalizer.
                 ipcFdParcel.close();
             } catch (IOException ioe) {
                 Log.w(TAG, "Failed to close IPC FD.", ioe);
             }
+            try {
+                for (ParcelFileDescriptor parcelFile : parcelFiles) {
+                    if (parcelFile != null) parcelFile.close();
+                }
+            } catch (IOException ioe) {
+                Log.w(TAG, "Failed to close IPC FD.", ioe);
+            }
         }
         mConnectionParams = null;
         if (onConnectionCallback != null) {