Merge 23255 - Implemented endofstream callback for media::PipelineImpl....

media/filters/video_renderer_base_unittest.cc

Index: media/filters/video_renderer_base_unittest.cc
===================================================================
--- media/filters/video_renderer_base_unittest.cc	(revision 23335)
+++ media/filters/video_renderer_base_unittest.cc	(working copy)
@@ -127,6 +127,12 @@
 
 // Test successful initialization and preroll.
 TEST_F(VideoRendererBaseTest, Initialize_Successful) {
+  // Who knows how many times ThreadMain() will execute!
+  //
+  // TODO(scherkus): really, really, really need to inject a thread into
+  // VideoRendererBase... it makes mocking much harder.
+  EXPECT_CALL(host_, GetTime()).WillRepeatedly(Return(base::TimeDelta()));
+
   InSequence s;
 
   // We expect the video size to be set.
Property changes on: media\filters\video_renderer_base_unittest.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/filters/video_renderer_base_unittest.cc:r23255