Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/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/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 
 if (is_android) {
@@ skipping 67 matching lines @@
   source_set("unit_tests") {
     testonly = true
     visibility = [ "//media/base:unit_tests" ]
     sources = [
       "media_codec_bridge_impl_unittest.cc",
       "media_codec_loop_unittest.cc",
       "media_codec_util_unittest.cc",
       "media_drm_bridge_unittest.cc",
       "media_player_bridge_unittest.cc",
       "media_service_throttler_unittest.cc",
-      "mock_media_codec_bridge.cc",
-      "mock_media_codec_bridge.h",
     ]
 
     deps = [
       "//media",
       "//media/base:test_support",
+      "//media/base/android:test_support",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/widevine/cdm:headers",
       "//ui/gfx:color_space",
     ]
     configs += [ "//media:media_config" ]
   }
 
+  static_library("test_support") {

[DaleCurtis, 2017/04/27 18:57:37]

source_set ?

[liberato (no reviews please), 2017/04/27 20:05:02]

Done.

+    testonly = true
+    sources = [
+      "mock_android_overlay.cc",
+      "mock_android_overlay.h",
+      "mock_media_codec_bridge.cc",
+      "mock_media_codec_bridge.h",
+      "test_destruction_observable.cc",
+      "test_destruction_observable.h",
+    ]
+    deps = [
+      "//media",
+      "//media/base:test_support",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+
   generate_jni("media_jni_headers") {
     sources = [
       "java/src/org/chromium/media/AudioManagerAndroid.java",
       "java/src/org/chromium/media/AudioRecordInput.java",
       "java/src/org/chromium/media/CodecProfileLevelList.java",
       "java/src/org/chromium/media/MediaCodecBridge.java",
       "java/src/org/chromium/media/MediaCodecUtil.java",
       "java/src/org/chromium/media/MediaDrmBridge.java",
       "java/src/org/chromium/media/MediaDrmStorageBridge.java",
       "java/src/org/chromium/media/MediaPlayerBridge.java",
@@ skipping 33 matching lines @@
       "java/src/org/chromium/media/MediaCodecUtil.java",
       "java/src/org/chromium/media/MediaDrmBridge.java",
       "java/src/org/chromium/media/MediaDrmSessionManager.java",
       "java/src/org/chromium/media/MediaDrmStorageBridge.java",
       "java/src/org/chromium/media/MediaPlayerBridge.java",
       "java/src/org/chromium/media/MediaPlayerListener.java",
       "java/src/org/chromium/media/MediaServerCrashListener.java",
     ]
   }
 }