Moving FileDescriptorInfo from content/ to base/.

base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Process;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
+import org.chromium.base.process_launcher.FileDescriptorInfo;
 import org.chromium.native_test.MainRunner;
 
 import javax.annotation.concurrent.GuardedBy;
 
 /**
  * The service implementation used to host all multiprocess test client code.
  */
 public class MultiprocessTestClientService extends Service {
     private static final String TAG = "cr_TestClient";
 
     private static boolean sAlreadyInitialized = false;
 
     private final Handler mHandler = new Handler();
 
     private final Object mResultLock = new Object();
 
     @GuardedBy("mResultLock")
     private MainReturnCodeResult mResult;
 
     private final ITestClient.Stub mBinder = new ITestClient.Stub() {
         @Override
         public int launch(final String[] commandLine, FileDescriptorInfo[] fdsToMap) {
             final int[] fdKeys = new int[fdsToMap.length];
             final int[] fdFds = new int[fdsToMap.length];
             for (int i = 0; i < fdsToMap.length; i++) {
-                fdKeys[i] = fdsToMap[i].key;
+                fdKeys[i] = fdsToMap[i].id;
                 // Take ownership of the file descriptor so they outlive the FileDescriptorInfo
                 // instances. Native code will own them.
                 fdFds[i] = fdsToMap[i].fd.detachFd();
             }
             // Don't run main directly, it would block and the response would not be returned.
             // We post to the main thread as this thread does not have a Looper.
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     int result = MainRunner.runMain(commandLine, fdKeys, fdFds);
@@ skipping 81 matching lines @@
             mResultLock.notifyAll();
         }
     }
 
     private static void markInitialized() {
         // We don't set sAlreadyInitialized directly in onCreate to avoid FindBugs complaining about
         // a static member been set from a non-static function.
         sAlreadyInitialized = true;
     }
 }