Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/mock_media_codec_bridge.h

Index: media/base/android/mock_media_codec_bridge.h
diff --git a/media/base/android/mock_media_codec_bridge.h b/media/base/android/mock_media_codec_bridge.h
index e7219cb24d9773b11c18d275f25cdebeeac63a7c..1dd9889b9c5845afed43a497c99ebba102e2526b 100644
--- a/media/base/android/mock_media_codec_bridge.h
+++ b/media/base/android/mock_media_codec_bridge.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_ANDROID_MOCK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MOCK_MEDIA_CODEC_BRIDGE_H_
 
+#include "base/memory/weak_ptr.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -58,6 +59,11 @@ class MockMediaCodecBridge : public MediaCodecBridge {
   MOCK_METHOD2(SetVideoBitrate, void(int bps, int frame_rate));
   MOCK_METHOD0(RequestKeyFrameSoon, void());
   MOCK_METHOD0(IsAdaptivePlaybackSupported, bool());
+
+  base::WeakPtr<MockMediaCodecBridge> GetWeakPtr();

[DaleCurtis, 2017/04/25 23:25:33]

Ditto, why not a MOCK_METHOD0(OnCodecDestroyed()) and a strictmock?

[liberato (no reviews please), 2017/04/27 18:30:12]

(per offline discussion)

+
+ private:
+  base::WeakPtrFactory<MockMediaCodecBridge> weak_this_factory_;
 };
 
 }  // namespace media