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..e251dfa73f19f0c927131fad01ec24dfa395d3d8 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 += [
@@ -765,6 +730,29 @@ test("content_browsertests") {
     }
   }
 
+  if (is_android || is_linux || is_mac || is_win) {
+    data = [
+      "$root_out_dir/content_shell.pak",
+      "data/",
+      "//media/test/data/",
+    ]

[Łukasz Anforowicz, 2016/10/20 21:40:54]

I am not sure why these data dependencies aren't just unconditional.  FWIW this
comes from https://crrev.com/355500 by brettw@.  Maybe we should consider making
this unconditional? (in a separate CL?)  This would also make it more obviously
safe to use "=" here but "+=" below.

[brettw, 2016/10/20 21:56:11]

This kind of thing would have normally just been copied from GYP, so I have no
idea.

+  }
+
+  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" ]

[Łukasz Anforowicz, 2016/10/20 21:40:54]

Maybe this should be moved to the generic section (i.e. next to "data/" and next
to current (is_android || is_linux || is_mac || is_win) condition.  Skipping
this filter file is not a huge performance win for the testing infrastructure
and it surely adds a little bit of complexity to the BUILD.gn file.  WDYT?  Do
it in a separate CL?  Not at all?  Just do this in this CL?

[sky, 2016/10/20 22:53:21]

Not sure what you are proposing. I like what you have here.

[Łukasz Anforowicz, 2016/10/20 22:58:33]

Okay, thanks.  To clarify, I'll put together a separate CL and share with you.

+  }
+
   if (is_win) {
     sources += [ "../browser/accessibility/accessibility_win_browsertest.cc" ]
 
@@ -777,10 +765,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" ]

[Łukasz Anforowicz, 2016/10/20 21:40:54]

Same as above - the filter file can just go into a generic section.

BTW: I haven't been able to say something like (pseudo-code):
data += all_files_matching("//testing/buildbot/filters/*content_browsertests*")

   }
 
   if (is_android) {
@@ -810,6 +803,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) {