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..215e3856f5380bad225e4b2a6c533cb40f95400b 100644
--- a/media/base/android/mock_media_codec_bridge.h
+++ b/media/base/android/mock_media_codec_bridge.h
@@ -5,13 +5,16 @@
 #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 "media/base/android/test_destruction_observable.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
-class MockMediaCodecBridge : public MediaCodecBridge {
+class MockMediaCodecBridge : public MediaCodecBridge,
+                             public DestructionObservable {
  public:
   MockMediaCodecBridge();
   ~MockMediaCodecBridge() override;