Paint first frame faster, don't crash with no frames during EOS.

media/base/null_video_sink_unittest.cc

 // Copyright 2015 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 <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 54 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NullVideoSinkTest);
 };
 
 TEST_F(NullVideoSinkTest, BasicFunctionality) {
   const base::TimeDelta kInterval = base::TimeDelta::FromMilliseconds(25);
 
   std::unique_ptr<NullVideoSink> sink = ConstructSink(false, kInterval);
   scoped_refptr<VideoFrame> test_frame = CreateFrame(base::TimeDelta());
 
-  // The sink shouldn't have to be started to use the paint method.
-  EXPECT_CALL(*this, FrameReceived(test_frame));
-  sink->PaintSingleFrame(test_frame);
-
   {
     SCOPED_TRACE("Waiting for sink startup.");
     sink->Start(this);
     const base::TimeTicks current_time = tick_clock_.NowTicks();
     const base::TimeTicks current_interval_end = current_time + kInterval;
     EXPECT_CALL(*this, Render(current_time, current_interval_end, false))
         .WillOnce(Return(test_frame));
     WaitableMessageLoopEvent event;
     EXPECT_CALL(*this, FrameReceived(test_frame))
         .WillOnce(RunClosure(event.GetClosure()));
@@ skipping 19 matching lines @@
     event.RunAndWait();
   }
 
   {
     SCOPED_TRACE("Waiting for stop event.");
     WaitableMessageLoopEvent event;
     sink->set_stop_cb(event.GetClosure());
     sink->Stop();
     event.RunAndWait();
   }
+
+  // The sink shouldn't have to be started to use the paint method.
+  EXPECT_CALL(*this, FrameReceived(test_frame));
+  sink->PaintSingleFrame(test_frame);
 }
 
 TEST_F(NullVideoSinkTest, ClocklessFunctionality) {
   // Construct the sink with a huge interval, it should still complete quickly.
   const base::TimeDelta interval = base::TimeDelta::FromSeconds(10);
   std::unique_ptr<NullVideoSink> sink = ConstructSink(true, interval);
 
   scoped_refptr<VideoFrame> test_frame = CreateFrame(base::TimeDelta());
   scoped_refptr<VideoFrame> test_frame_2 = CreateFrame(interval);
   sink->Start(this);
@@ skipping 18 matching lines @@
           .WillOnce(
               DoAll(RunClosure(event.GetClosure()), Return(test_frame_2)));
     }
   }
   event.RunAndWait();
   ASSERT_LT(base::TimeTicks::Now() - now, kTestRuns * interval);
   sink->Stop();
 }
 
 }  // namespace media