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

content/test/BUILD.gn

 # Copyright 2014 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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
@@ skipping 623 matching lines @@
     "../renderer/render_view_browsertest.cc",
     "../renderer/render_view_browsertest_mac.mm",
     "../renderer/render_widget_browsertest.cc",
     "../renderer/visual_state_browsertest.cc",
     "../renderer/webclipboard_impl_browsertest.cc",
     "../test/browser_test_utils_browsertest.cc",
     "../test/content_browser_test_test.cc",
     "../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 += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   deps = [
     ":browsertest_support",
     ":content_test_mojo_bindings",
@@ skipping 69 matching lines @@
       "//ppapi/proxy",
       "//ppapi/proxy:ipc",
       "//ppapi/shared_impl:test_support",
     ]
     data_deps += [ "//ppapi:ppapi_tests" ]
     if (is_mac) {
       data += [ "$root_out_dir/ppapi_tests.plugin/" ]
     }
   }
 
+  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" ]
 
     deps += [
       "//content/app/strings",
       "//net:net_resources",
       "//third_party/WebKit/public:resources",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
     ]
 
     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) {
     sources += [
       "../browser/accessibility/android_granularity_movement_browsertest.cc",
       "../browser/media/session/audio_focus_delegate_android_browsertest.cc",
       "../shell/android/browsertests_apk/content_browser_tests_jni_onload.cc",
     ]
     sources -= [
       "../browser/battery_status/battery_monitor_impl_browsertest.cc",
       "../browser/media/session/audio_focus_delegate_default_browsertest.cc",
     ]
     deps += [
       ":content_browsertests_java",
       "//content/shell:content_shell_lib",
       "//content/shell/android:content_shell_assets",
       "//content/shell/android:content_shell_jni_headers",
       "//testing/android/native_test:native_test_support",
     ]
     deps -= [ "//device/battery" ]
     android_manifest =
         "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml"
     android_manifest_dep = ":content_browsertests_manifest"
     use_default_launcher = false
   }
 
   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) {
     deps += [ "//chromeos" ]
   }
 
   if (use_aura && !is_win) {
     deps += [ "//ui/events:test_support" ]
   }
 
@@ skipping 865 matching lines @@
   if (is_android) {
     deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
 group("fuzzers") {
   deps = [
     "//content/test/fuzzer",
   ]
 }