Add AVDA unittests to media_unittests

media/gpu/BUILD.gn

 # Copyright 2016 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/features.gni")
 import("//build/config/ui.gni")
 import("//media/gpu/args.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
@@ skipping 350 matching lines @@
     ldflags += [
       "/DELAYLOAD:d3d9.dll",
       "/DELAYLOAD:d3d11.dll",
       "/DELAYLOAD:dxva2.dll",
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
     ]
   }
 }
 
+# TODO(watk): Run this on bots. http://crbug.com/461437
 if (is_win || is_android || is_chromeos) {
   test("video_decode_accelerator_unittest") {
     sources = [
       "video_accelerator_unittest_helpers.h",
     ]
 
     deps = [
       ":gpu",
       "//base",
       "//media",
-      "//media/gpu",
       "//testing/gtest",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
       "//ui/gl",
       "//ui/gl:test_support",
       "//ui/gl/init",
     ]
 
     configs += [
       "//third_party/khronos:khronos_headers",
       ":gpu_config",
     ]
     if (is_chromeos && current_cpu != "arm") {
       configs += [ "//third_party/libva:libva_config" ]
     }
 
-    if (is_android) {
-      sources += [
-        "android_video_decode_accelerator_unittest.cc",
-        "avda_codec_allocator_unittest.cc",
-      ]
-      deps += [
-        "//gpu:test_support",
-        "//media/base/android",
-        "//media/base/android:media_java",
-        "//testing/gmock",
-        "//ui/android:ui_java",
-      ]
-    } else {
+    if (is_win || is_chromeos) {
       sources += [
         "rendering_helper.cc",
         "rendering_helper.h",
         "video_decode_accelerator_unittest.cc",
       ]
       deps += [
         "//ui/display",
         "//ui/display/types",
         "//ui/platform_window",
       ]
-      if (use_ozone) {
-        deps += [ "//ui/ozone" ]
-      }
+    }
+
+    if (is_android) {
+      deps += [
+        ":android_video_decode_accelerator_unittests",
+        "//media/base/android:media_java",
+        "//media/test:run_all_unittests",
+        "//ui/android:ui_java",
+      ]
     }
 
     if (is_win) {
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
       deps += [
         "//third_party/angle:libEGL",
         "//third_party/angle:libGLESv2",
       ]
     }
 
     if (use_x11) {
       configs += [ "//build/config/linux:x11" ]
       deps += [ "//ui/gfx/x" ]
     }
+
+    if (use_ozone) {
+      deps += [ "//ui/ozone" ]
+    }
   }
 }
 
+source_set("android_video_decode_accelerator_unittests") {
+  if (is_android) {
+    testonly = true
+    sources = [
+      "android_video_decode_accelerator_unittest.cc",
+      "avda_codec_allocator_unittest.cc",
+    ]
+    deps = [
+      ":gpu",
+      "//gpu:test_support",
+      "//media/base/android",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+}
+
 if (is_chromeos || is_mac || is_win) {
   test("video_encode_accelerator_unittest") {
     deps = [
       "//base",
       "//media",
       "//media/base:test_support",
       "//media/gpu",
       "//testing/gtest",
       "//ui/base",
       "//ui/gfx",
@@ skipping 46 matching lines @@
       "video_accelerator_unittest_helpers.h",
     ]
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]
     }
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
     }
   }
 }