Fix flaky behavior in pipeline teardown.

media/base/pipeline_impl.h

 // Copyright (c) 2010 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.
 
 // Implementation of Pipeline.
 
 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
 #include <set>
@@ skipping 108 matching lines @@
   // Reset the state of the pipeline object to the initial state.  This method
   // is used by the constructor, and the Stop() method.
   void ResetState();
 
   // Updates |state_|. All state transitions should use this call.
   void set_state(State next_state);
 
   // Simple method used to make sure the pipeline is running normally.
   bool IsPipelineOk();
 
-  // Helper method to tell whether we are in the state of initializing.
-  bool IsPipelineInitializing();
-
   // Helper method to tell whether we are stopped or in error.
   bool IsPipelineStopped();
 
   // Helper method to tell whether we are in transition to stop state.
   bool IsPipelineTearingDown();
 
   // We could also be delayed by a transition during seek is performed.
   bool IsPipelineStopPending();
 
   // Helper method to tell whether we are in transition to seek state.
@@ skipping 145 matching lines @@
 
   // Whether or not the pipeline is in transition for a seek operation.
   bool seek_pending_;
 
   // Whether or not the pipeline is pending a stop operation.
   bool stop_pending_;
 
   // Whether or not the pipeline is perform a stop operation.
   bool tearing_down_;
 
+  // Whether or not an error triggered the teardown.
+  bool error_caused_teardown_;
+
   // Duration of the media in microseconds.  Set by filters.
   base::TimeDelta duration_;
 
   // Amount of available buffered data in microseconds.  Set by filters.
   base::TimeDelta buffered_time_;
 
   // Amount of available buffered data.  Set by filters.
   int64 buffered_bytes_;
 
   // Total size of the media.  Set by filters.
@@ skipping 94 matching lines @@
 
   FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);
   FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo);
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_