Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/mock_android_overlay.cc

Index: media/base/android/mock_android_overlay.cc
diff --git a/media/base/android/mock_android_overlay.cc b/media/base/android/mock_android_overlay.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4811519a592a4c20a7a2b63f8492cd2325f6ba87
--- /dev/null
+++ b/media/base/android/mock_android_overlay.cc
@@ -0,0 +1,63 @@
+// Copyright 2017 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.
+
+#include "media/base/android/mock_android_overlay.h"
+
+#include "base/bind.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace media {
+
+MockAndroidOverlay::Callbacks::Callbacks() = default;
+MockAndroidOverlay::Callbacks::Callbacks(const Callbacks&) = default;
+MockAndroidOverlay::Callbacks::~Callbacks() = default;
+
+MockAndroidOverlay::MockAndroidOverlay() : weak_factory_(this) {}
+
+MockAndroidOverlay::~MockAndroidOverlay() {}
+
+void MockAndroidOverlay::SetConfig(const Config& config) {
+  config_ = config;
+}
+
+MockAndroidOverlay::Callbacks MockAndroidOverlay::GetCallbacks() {
+  Callbacks c;
+  c.OverlayReady = base::Bind(&MockAndroidOverlay::CallbackTrampoline,

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

Why do you need the trampoline? Can't you just bind directly using the WeakPtr? 

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

so the caller knows if the callback succeeded.  that said, i'm not sure that i
actually use that property anywhere anymore.  will delete if so.

+                              &MockAndroidOverlay::OnOverlayReady,
+                              weak_factory_.GetWeakPtr());
+  c.OverlayFailed = base::Bind(&MockAndroidOverlay::CallbackTrampoline,
+                               &MockAndroidOverlay::OnOverlayFailed,
+                               weak_factory_.GetWeakPtr());
+  c.SurfaceDestroyed = base::Bind(&MockAndroidOverlay::CallbackTrampoline,
+                                  &MockAndroidOverlay::OnSurfaceDestroyed,
+                                  weak_factory_.GetWeakPtr());
+
+  return c;
+}
+
+bool MockAndroidOverlay::CallbackTrampoline(
+    void (MockAndroidOverlay::*cb)(),
+    base::WeakPtr<MockAndroidOverlay> wp) {
+  MockAndroidOverlay* overlay = wp.get();
+  if (!overlay)
+    return false;
+
+  (overlay->*cb)();
+
+  return true;
+}
+
+void MockAndroidOverlay::OnOverlayReady() {
+  config_.ready_cb.Run(this);
+}
+
+void MockAndroidOverlay::OnOverlayFailed() {
+  config_.failed_cb.Run(this);
+}
+
+void MockAndroidOverlay::OnSurfaceDestroyed() {
+  config_.destroyed_cb.Run(this);
+}
+
+}  // namespace media