media: Clean up MediaCodecBridge and remove subclasses

media/gpu/avda_codec_allocator_unittest.cc

 // 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.
 
 #include "media/gpu/avda_codec_allocator.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 30 matching lines @@
   event->Signal();
 }
 }
 
 class MockClient : public AVDACodecAllocatorClient {
  public:
   MOCK_METHOD1(OnSurfaceAvailable, void(bool success));
   MOCK_METHOD0(OnSurfaceDestroyed, void());
 
   // Gmock doesn't let us mock methods taking move-only types.
-  MOCK_METHOD1(OnCodecConfiguredMock, void(VideoCodecBridge* media_codec));
+  MOCK_METHOD1(OnCodecConfiguredMock, void(MediaCodecBridge* media_codec));
   void OnCodecConfigured(
-      std::unique_ptr<VideoCodecBridge> media_codec) override {
+      std::unique_ptr<MediaCodecBridge> media_codec) override {
     OnCodecConfiguredMock(media_codec.get());
   }
 };
 
 class AVDACodecAllocatorTest : public testing::Test {
  public:
   AVDACodecAllocatorTest()
       : allocator_thread_("AllocatorThread"),
         stop_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                     base::WaitableEvent::InitialState::NOT_SIGNALED) {
@@ skipping 235 matching lines @@
 
 TEST_F(AVDACodecAllocatorTest, DeallocatingIsSafeDuringSurfaceDestroyed) {
   allocator2_->AllocateSurface(avda1_, 1);
   EXPECT_CALL(*avda1_, OnSurfaceDestroyed()).WillOnce(Invoke([=]() {
     allocator2_->DeallocateSurface(avda1_, 1);
   }));
   allocator2_->OnSurfaceDestroyed(1);
 }
 
 }  // namespace media