Really include *.content_browsertests.filter in data dependencies of Android.

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 38b33044eec970d1a0d21062c906cdad68412ef9..3cd349aa94e05946468bcbc2c1a15c2b8ef52b7e 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -641,41 +641,6 @@ test("content_browsertests") {
     "../test/webui_resource_browsertest.cc",
   ]
 
-  if (is_android || is_linux || is_mac || is_win) {
-    data = [
-      "$root_out_dir/content_shell.pak",
-      "data/",
-      "//media/test/data/",
-    ]
-
-    if (!is_android) {
-      data += [
-        "//net/tools/testserver/",
-        "//ppapi/tests/test_case.html",
-        "//ppapi/tests/test_page.css",
-        "//third_party/pyftpdlib/",
-        "//third_party/pywebsocket/",
-        "//third_party/tlslite/",
-      ]
-
-      if (is_mac) {
-        data += [ "$root_out_dir/Content Shell.app/" ]
-      }
-      if (is_win) {
-        if (symbol_level != 0) {
-          data += [ "$root_out_dir/content_browsertests.exe.pdb" ]
-        }
-      }
-      if (is_linux) {
-        data += [ "//testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter" ]
-      }
-
-      if (is_win || is_linux || is_android) {
-        data += [ "//testing/buildbot/filters/site-per-process.content_browsertests.filter" ]
-      }
-    }
-  }
-
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   configs += [
@@ -748,6 +713,8 @@ test("content_browsertests") {
     "//ui/snapshot",
   ]
 
+  data = []
+
   data_deps = [
     "//third_party/mesa:osmesa",
   ]
@@ -765,6 +732,29 @@ test("content_browsertests") {
     }
   }
 
+  if (is_android || is_linux || is_mac || is_win) {
+    data += [
+      "$root_out_dir/content_shell.pak",
+      "data/",
+      "//media/test/data/",
+    ]
+  }
+
+  if (is_linux || is_mac || is_win) {
+    data += [
+      "//net/tools/testserver/",
+      "//ppapi/tests/test_case.html",
+      "//ppapi/tests/test_page.css",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/tlslite/",
+    ]
+  }
+
+  if (is_win || is_linux || is_android) {
+    data += [ "//testing/buildbot/filters/site-per-process.content_browsertests.filter" ]
+  }
+
   if (is_win) {
     sources += [ "../browser/accessibility/accessibility_win_browsertest.cc" ]
 
@@ -777,10 +767,15 @@ test("content_browsertests") {
     ]
 
     libs = [ "oleacc.lib" ]
+
+    if (symbol_level != 0) {
+      data += [ "$root_out_dir/content_browsertests.exe.pdb" ]
+    }
   }
 
   if (is_linux) {
     sources += [ "../zygote/zygote_browsertest.cc" ]
+    data += [ "//testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter" ]
   }
 
   if (is_android) {
@@ -810,6 +805,7 @@ test("content_browsertests") {
   if (is_mac) {
     sources += [ "../renderer/external_popup_menu_browsertest.cc" ]
     deps += [ "//content/shell:content_shell" ]
+    data += [ "$root_out_dir/Content Shell.app/" ]
   }
 
   if (is_chromeos) {