Moving FileDescriptorInfo from content/ to base/.

base/test/BUILD.gn

Index: base/test/BUILD.gn
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 844707ebd190948d993e5e62f2747516aaa4fa93..a1c47de5a2c53b41ac41706cf271d1e658e979fa 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -353,7 +353,6 @@ if (is_android) {
     ]
     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",
@@ -367,7 +366,10 @@ if (is_android) {
 
   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",
     ]