media: Support better decoder switching

media/renderers/video_renderer_impl_unittest.cc

 // Copyright 2013 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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 39 matching lines @@
   *result_listener << "has timestamp " << arg->timestamp().InMilliseconds();
   return arg->timestamp().InMilliseconds() == ms;
 }
 
 class VideoRendererImplTest : public testing::Test {
  public:
   ScopedVector<VideoDecoder> CreateVideoDecodersForTest() {
     decoder_ = new NiceMock<MockVideoDecoder>();
     ScopedVector<VideoDecoder> decoders;
     decoders.push_back(decoder_);
-    EXPECT_CALL(*decoder_, Initialize(_, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<4>(&output_cb_),
-                        RunCallback<3>(expect_init_success_)));
+    ON_CALL(*decoder_, Initialize(_, _, _, _, _))
+        .WillByDefault(DoAll(SaveArg<4>(&output_cb_),
+                             RunCallback<3>(expect_init_success_)));
     // Monitor decodes from the decoder.
     ON_CALL(*decoder_, Decode(_, _))
         .WillByDefault(Invoke(this, &VideoRendererImplTest::DecodeRequested));
     ON_CALL(*decoder_, Reset(_))
         .WillByDefault(Invoke(this, &VideoRendererImplTest::FlushRequested));
     return decoders;
   }
 
   VideoRendererImplTest()
       : tick_clock_(new base::SimpleTestTickClock()),
@@ skipping 1139 matching lines @@
   QueueFrames("0 10 20 30");
   StartPlayingFrom(0);
   Flush();
   ASSERT_EQ(1u, frame_ready_cbs_.size());
   // This frame will be discarded.
   frame_ready_cbs_.front().Run();
   Destroy();
 }
 
 }  // namespace media