Add AndroidVideoSurfaceChooser to manage overlays.

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 162 matching lines @@
       "Foundation.framework",
       "QuartzCore.framework",
       "VideoToolbox.framework",
     ]
   }
 
   if (is_android) {
     sources += [
       "android_video_decode_accelerator.cc",
       "android_video_decode_accelerator.h",
+      "android_video_surface_chooser.h",
+      "android_video_surface_chooser_impl.cc",
+      "android_video_surface_chooser_impl.h",
       "avda_codec_allocator.cc",
       "avda_codec_allocator.h",
       "avda_codec_image.cc",
       "avda_codec_image.h",
       "avda_picture_buffer_manager.cc",
       "avda_picture_buffer_manager.h",
       "avda_shared_state.cc",
       "avda_shared_state.h",
       "avda_state_provider.h",
       "avda_surface_bundle.cc",
       "avda_surface_bundle.h",
       "content_video_view_overlay.cc",
       "content_video_view_overlay.h",
       "content_video_view_overlay_allocator.cc",
       "content_video_view_overlay_allocator.h",
+      "content_video_view_overlay_factory.cc",
+      "content_video_view_overlay_factory.h",
       "surface_texture_gl_owner.cc",
       "surface_texture_gl_owner.h",
     ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libyuv" ]
       sources += [
         "android_video_encode_accelerator.cc",
         "android_video_encode_accelerator.h",
       ]
@@ skipping 229 matching lines @@
       deps += [ "//ui/ozone" ]
     }
   }
 }
 
 source_set("android_video_decode_accelerator_unittests") {
   if (is_android) {
     testonly = true
     sources = [
       "android_video_decode_accelerator_unittest.cc",
+      "android_video_surface_chooser_impl_unittest.cc",
       "avda_codec_allocator_unittest.cc",
       "content_video_view_overlay_allocator_unittest.cc",
       "surface_texture_gl_owner_unittest.cc",
     ]
     if (enable_media_codec_video_decoder) {
       sources += [ "android/media_codec_video_decoder_unittest.cc" ]
     }
     deps = [
       ":gpu",
       "//base/test:test_support",
       "//gpu:test_support",
       "//media",
+      "//media/base/android:test_support",
       "//testing/gmock",
       "//testing/gtest",
     ]
   }
 }
 
 if (is_chromeos || is_mac || is_win) {
   test("video_encode_accelerator_unittest") {
     deps = [
       "//base",
@@ skipping 72 matching lines @@
     "//base/test:test_support",
     "//gpu:test_support",
     "//media/gpu/ipc/common",
     "//media/gpu/ipc/service",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
   ]
 }