Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/mock_media_codec_bridge.cc

Index: media/base/android/mock_media_codec_bridge.cc
diff --git a/media/base/android/mock_media_codec_bridge.cc b/media/base/android/mock_media_codec_bridge.cc
index df4359236eb0189fd8542dc2e2982904ad488eac..897adb6acbc90df635e961afad02e29e762ff72b 100644
--- a/media/base/android/mock_media_codec_bridge.cc
+++ b/media/base/android/mock_media_codec_bridge.cc
@@ -12,7 +12,7 @@ using ::testing::Return;
 
 namespace media {
 
-MockMediaCodecBridge::MockMediaCodecBridge() {
+MockMediaCodecBridge::MockMediaCodecBridge() : weak_this_factory_(this) {
   ON_CALL(*this, DequeueInputBuffer(_, _))
       .WillByDefault(Return(MEDIA_CODEC_TRY_AGAIN_LATER));
   ON_CALL(*this, DequeueOutputBuffer(_, _, _, _, _, _, _))
@@ -21,4 +21,8 @@ MockMediaCodecBridge::MockMediaCodecBridge() {
 
 MockMediaCodecBridge::~MockMediaCodecBridge() {}
 
+base::WeakPtr<MockMediaCodecBridge> MockMediaCodecBridge::GetWeakPtr() {
+  return weak_this_factory_.GetWeakPtr();
+}
+
 }  // namespace media