Create an android_browsertests test target on Android.

This makes an android_browsertests target that compiles but does not do
anything too useful yet.

The target has a dependency on a new test_support_ui_android target
that mirrors the test_support_ui target desktop browser_tests depend on
which will include in the future any BrowserTestBase subclasses. It also
pulls in the //chrome/browser and //content/public/browser dependencies
for tests.

We do a bunch of cleanup in the desktop browser_tests target since it
is no longer being built for android.
1) The //chrome/browser/test_support_ui target can be scoped entirely
to non-android, and some of its deps are cleaned up: blink_headers and
gtest are not used by that target and don't need to be there.
2) We merge the `sources`, `deps`, `data_deps` and `data` variables in
the browser_tests target up into a single assignment since they do not
need to split between shared-with-android and not-shared-with-android
anymore.
3) I noticed we had both chromeos-and-nacl and nacl-and-chromeos
sections, so merged them together into the latter.
4) Moved the blink_headers dependency to the browser_tests target
where it is used by render_view_browsertest.cc. Removed it from
//chrome/test:test_support_ui as well, as it was not used there
either.

R=sky@chromium.org

Bug: 961849
Change-Id: I18262595db5c1713cb2d830894798cc82b90c200
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1627946
Auto-Submit: danakj <danakj@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664024}

chrome/browser/BUILD.gn

@@ -5525,47 +5525,37 @@ static_library("test_support") {
   }
 }
 
-static_library("test_support_ui") {
-  testonly = true
-
-  # Always include this via the main test support UI target.
-  visibility = [ "//chrome/test:test_support_ui" ]
-
-  sources = [
-    "signin/token_revoker_test_utils.cc",
-    "signin/token_revoker_test_utils.h",
-  ]
-
-  deps = [
-    "//components/metrics:test_support",
-    "//components/password_manager/core/browser:test_support",
-    "//components/translate/content/common",
-    "//skia",
-    "//testing/gtest",
-    "//third_party/blink/public:blink_headers",
-  ]
+if (!is_android) {
+  static_library("test_support_ui") {
+    testonly = true
+    configs += [ "//build/config:precompiled_headers" ]
 
-  public_deps = [
-    "//net:test_support",
-  ]
+    # Always include this via the main test support UI target.
+    visibility = [ "//chrome/test:test_support_ui" ]
 
-  configs += [ "//build/config:precompiled_headers" ]
-
-  if (!is_android) {
-    sources += [
+    sources = [
       "password_manager/password_manager_test_base.cc",
       "password_manager/password_manager_test_base.h",
+      "signin/token_revoker_test_utils.cc",
+      "signin/token_revoker_test_utils.h",
       "ui/webui/signin/login_ui_test_utils.cc",
       "ui/webui/signin/login_ui_test_utils.h",
       "ui/webui/web_ui_test_handler.cc",
       "ui/webui/web_ui_test_handler.h",
     ]
 
-    deps += [
+    deps = [
       ":browser",
       "//chrome:browser_tests_pak",
       "//chrome/common:mojo_bindings",
       "//chrome/test/data:web_ui_test_bindings",
+      "//components/metrics:test_support",
+      "//components/password_manager/core/browser:test_support",
+      "//components/translate/content/common",
+    ]
+
+    public_deps = [
+      "//net:test_support",
     ]
   }
 }