Refactor FFmpegDemuxerTest to use gmock and eliminate flakiness.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 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 "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ skipping 153 matching lines @@
 
 
 //
 // FFmpegDemuxer
 //
 FFmpegDemuxer::FFmpegDemuxer()
     : thread_("DemuxerThread") {
 }
 
 FFmpegDemuxer::~FFmpegDemuxer() {
-  Stop();
+  DCHECK(!thread_.IsRunning());
+  DCHECK(!format_context_.get());
   // TODO(scherkus): I believe we need to use av_close_input_file() here
   // instead of scoped_ptr_malloc calling av_free().
   //
   // Note that av_close_input_file() doesn't close the codecs so we need to
   // figure out who's responsible for closing the them.
 }
 
 void FFmpegDemuxer::PostDemuxTask() {
   thread_.message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(this, &FFmpegDemuxer::DemuxTask));
 }
 
 void FFmpegDemuxer::Stop() {
   thread_.Stop();
+  format_context_.reset();
 }
 
 void FFmpegDemuxer::Seek(base::TimeDelta time) {
   // TODO(hclam): by returning from this method, it is assumed that the seek
   // operation is completed and filters behind the demuxer is good to issue
   // more reads, but we are posting a task here, which makes the seek operation
   // asynchronous, should change how seek works to make it fully asynchronous.
   thread_.message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(this, &FFmpegDemuxer::SeekTask, time));
 }
@@ skipping 189 matching lines @@
   }
   DCHECK_EQ(clone->size, packet->size);
   clone->dts = packet->dts;
   clone->pts = packet->pts;
   clone->duration = packet->duration;
   memcpy(clone->data, packet->data, clone->size);
   return clone.release();
 }
 
 }  // namespace media