DialogSurfaceManager implementation.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index aed55c3f5328b61e80ea44f357b26f3418a24258..a2d2ac92bfa4f45f7e5527c4b4fe1ca9119d88ab 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.text.TextUtils;
@@ -31,6 +32,7 @@ import org.chromium.content.common.ContentSwitches;
 import org.chromium.content.common.FileDescriptorInfo;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.SurfaceWrapper;
+import org.chromium.media.DialogSurfaceManagerImpl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -823,6 +825,19 @@ public class ChildProcessLauncher {
                 }
                 return new SurfaceWrapper(surface);
             }
+
+            @Override
+            public IBinder getDialogSurfaceManager() {
+                if (callbackType != CALLBACK_FOR_GPU_PROCESS) {
+                    Log.e(TAG, "Illegal callback for non-GPU process.");
+                    return null;
+                }
+                // We create a new one of these every time, but it's only
+                // retained if DialogSurfaceManager really needs it.  Also, it's
+                // likely that we're only called once anyway.
+                return DialogSurfaceManagerImpl.instance(

[boliu, 2017/01/04 23:14:39]

getInstance a bit more idiomatic I think

[liberato (no reviews please), 2017/01/11 22:17:55]

Done.

+                        new DialogSurfaceWindowTokenProviderImpl());
+            }
         };
     }