Moving FileDescriptorInfo from content/ to base/.

base/test/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/ui.gni")
 import("//build/config/nacl/config.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
@@ skipping 335 matching lines @@
   android_library("test_support_java") {
     testonly = true
     deps = [
       "//base:base_java",
       "//testing/android/native_test:native_main_runner_java",
       "//third_party/android_tools:android_support_annotations_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
     srcjar_deps = [ ":test_support_java_aidl" ]
     java_files = [
-      "android/java/src/org/chromium/base/FileDescriptorInfo.java",
       "android/java/src/org/chromium/base/MainReturnCodeResult.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
       "android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
     ]
   }
 
   android_aidl("test_support_java_aidl") {
     testonly = true
-    import_include = [ "android/java/src" ]
+    import_include = [
+      "android/java/src",
+      "//base/android/java/src",
+    ]
     sources = [
       "android/java/src/org/chromium/base/ITestClient.aidl",
     ]
   }
 }