Move the test template to //testing/test.gni (part 2)

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index a40aa8b3e9920f505c35dc2fb73de295e83e5345..d4290f926a8d27b046d6f2a7b17177b72ac79bea 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
+import("//testing/rules.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ -850,9 +851,7 @@ test("ui_base_unittests") {
   }
 
   if (is_android) {
-    deps += [
-      #"testing/android/native_test.gyp:native_test_native_code"  TODO(GYP)

[tfarina, 2015/01/12 18:44:59]

Why this is not necessary anymore? I was going to upload a CL fixing this TODO.

[qsr, 2015/01/12 18:48:54]

Because this CL change the test template so that we never need anything like
this anymore. As this is WiP, please feel free to fix that as you need, and I
will just remove it when this lands.

-    ]
+    apk_deps = [ "//chrome:resources" ]
   }
 
   if (use_pango) {
@@ -901,14 +900,3 @@ test("ui_base_unittests") {
     deps += [ "//chromeos" ]
   }
 }
-
-# TODO(GYP) Mac (ui_base_tests_bundle)

[tfarina, 2015/01/12 19:10:37]

btw, do not remove this Mac TODO. We still need to do it.

[qsr, 2015/01/12 19:15:52]

Will do. The comment was really weird, as it seemed to apply to an is_android
section, which made little sense.

-if (is_android) {
-  unittest_apk("ui_base_unittests_apk") {

[tfarina, 2015/01/12 18:44:59]

Why is is going away now?

[qsr, 2015/01/12 18:48:54]

Because this CL change the test template to automatically create the apk.

-    unittests_dep = ":ui_base_unittests"
-    deps = [
-      ":ui_base_unittests",
-      "//chrome:resources",
-    ]
-  }
-}