Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/BUILD.gn

Index: media/base/android/BUILD.gn
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index 2018c4000ef5f0259728bfa99cc7f26b3122da4f..73336557e2a9194673179e8766c59f67386a4633 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -85,13 +85,12 @@ if (is_android) {
       "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",
@@ -100,6 +99,24 @@ if (is_android) {
     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",