Merge Pipeline's kError state with kStopped: a baby step towards bringing sanity to shutdown.

webkit/media/webmediaplayer_impl.h

 // Copyright (c) 2012 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 266 matching lines @@
   WebKit::WebMediaPlayer::NetworkState network_state_;
   WebKit::WebMediaPlayer::ReadyState ready_state_;
 
   // Keep a list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Message loops for posting tasks between Chrome's main thread. Also used
   // for DCHECKs so methods calls won't execute in the wrong thread.
   MessageLoop* main_loop_;
 
-  // A collection of filters.
   scoped_ptr<media::FilterCollection> filter_collection_;
-
-  // The media pipeline and a bool tracking whether we have started it yet.
-  //
-  // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and
-  // have WebMediaPlayerImpl return the default values to WebKit instead of
-  // relying on Pipeline to take care of default values.
   scoped_refptr<media::Pipeline> pipeline_;
-  bool started_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   WebKit::WebString current_key_system_;
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
 
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
@@ skipping 40 matching lines @@
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
   ProxyDecryptor decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_