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) {

[sky, 2016/10/20 20:36:48]

Thanks for trying to clean things up. These conditionals are away from other
conditionals, so it's hard to see we already have conditionals for some of these
cases. Please merge these conditionals with the others below.

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

Done.

     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" ]
-      }
+  }
+  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_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",
@@ skipping 1000 matching lines @@
   if (is_android) {
     deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
 group("fuzzers") {
   deps = [
     "//content/test/fuzzer",
   ]
 }