Add AndroidVideoSurfaceChooser to manage overlays.

media/base/android/mock_media_codec_bridge.h

 // Copyright 2016 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.
 
 #ifndef MEDIA_BASE_ANDROID_MOCK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MOCK_MEDIA_CODEC_BRIDGE_H_
 
+#include "base/memory/weak_ptr.h"

[DaleCurtis, 2017/04/27 22:01:11]

Drop.

[liberato (no reviews please), 2017/04/27 23:17:05]

Done.

 #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;
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD0(Flush, MediaCodecStatus());
   MOCK_METHOD1(GetOutputSize, MediaCodecStatus(gfx::Size* size));
   MOCK_METHOD1(GetOutputSamplingRate, MediaCodecStatus(int* sampling_rate));
   MOCK_METHOD1(GetOutputChannelCount, MediaCodecStatus(int* channel_count));
   MOCK_METHOD4(QueueInputBuffer,
                MediaCodecStatus(int index,
@@ skipping 31 matching lines @@
   MOCK_METHOD0(GetName, std::string());
   MOCK_METHOD1(SetSurface, bool(jobject surface));
   MOCK_METHOD2(SetVideoBitrate, void(int bps, int frame_rate));
   MOCK_METHOD0(RequestKeyFrameSoon, void());
   MOCK_METHOD0(IsAdaptivePlaybackSupported, bool());
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MOCK_MEDIA_CODEC_BRIDGE_H_