DO NOT COMMIT - DialogSurface initial implementation.

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 efe77a9d7053b6dc182ed465a33f12c0f6bb0997..e2c4a1035bb32d6e74eaec156c2b50fe75cea19e 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -10,6 +10,16 @@ import("//media/media_options.gni")
 
 assert(is_android)
 
+android_aidl("common_aidl") {
+  interface_file = "java/src/org/chromium/media/common.aidl"
+  import_include = "java/src"
+  sources = [
+    "java/src/org/chromium/media/IDialogSurfaceCallback.aidl",
+    "java/src/org/chromium/media/IDialogSurfaceController.aidl",
+    "java/src/org/chromium/media/IDialogSurfaceManager.aidl",
+  ]
+}
+
 source_set("android") {
   sources = [
     "access_unit_queue.cc",
@@ -23,6 +33,12 @@ source_set("android") {
     "demuxer_android.h",
     "demuxer_stream_player_params.cc",
     "demuxer_stream_player_params.h",
+    "dialog_surface_callback.cc",
+    "dialog_surface_callback.h",
+    "dialog_surface_controller.cc",
+    "dialog_surface_controller.h",
+    "dialog_surface_manager.cc",
+    "dialog_surface_manager.h",
     "media_client_android.cc",
     "media_client_android.h",
     "media_codec_bridge.cc",
@@ -113,6 +129,9 @@ 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/DialogSurfaceCallback.java",
+    "java/src/org/chromium/media/DialogSurfaceControllerWrapper.java",
+    "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java",
     "java/src/org/chromium/media/MediaCodecBridge.java",
     "java/src/org/chromium/media/MediaCodecUtil.java",
     "java/src/org/chromium/media/MediaDrmBridge.java",
@@ -125,11 +144,19 @@ generate_jni("media_jni_headers") {
 android_library("media_java") {
   deps = [
     "//base:base_java",
+    "//media/base/android:common_aidl",
   ]
 
+  srcjar_deps = [ ":common_aidl" ]
+
   java_files = [
     "java/src/org/chromium/media/AudioManagerAndroid.java",
     "java/src/org/chromium/media/AudioRecordInput.java",
+    "java/src/org/chromium/media/DialogSurfaceCallback.java",
+    "java/src/org/chromium/media/DialogSurfaceController.java",
+    "java/src/org/chromium/media/DialogSurfaceControllerWrapper.java",
+    "java/src/org/chromium/media/DialogSurfaceManager.java",
+    "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java",
     "java/src/org/chromium/media/MediaCodecBridge.java",
     "java/src/org/chromium/media/MediaCodecUtil.java",
     "java/src/org/chromium/media/MediaDrmBridge.java",