Refactoring StreamParser & StreamParserHost interfaces.

media/webm/webm_stream_parser.h

Index: media/webm/webm_stream_parser.h
diff --git a/media/webm/webm_stream_parser.h b/media/webm/webm_stream_parser.h
index 9b45c441635d39ef110536cf9e199b827aaf7087..699b4690b0fc1da6355e5fb1c4b69945a14883ec 100644
--- a/media/webm/webm_stream_parser.h
+++ b/media/webm/webm_stream_parser.h
@@ -9,6 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
+#include "media/base/byte_queue.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 #include "media/webm/webm_cluster_parser.h"
@@ -23,13 +24,14 @@ class WebMStreamParser : public StreamParser {
   // StreamParser implementation.
   virtual void Init(const InitCB& init_cb, StreamParserHost* host) OVERRIDE;
   virtual void Flush() OVERRIDE;
-  virtual int Parse(const uint8* buf, int size) OVERRIDE;
+  virtual bool Parse(const uint8* buf, int size) OVERRIDE;
 
  private:
   enum State {
-    WAITING_FOR_INIT,
-    PARSING_HEADERS,
-    PARSING_CLUSTERS
+    kWaitingForInit,
+    kParsingHeaders,
+    kParsingClusters,
+    kError
   };
 
   void ChangeState(State new_state);
@@ -58,6 +60,7 @@ class WebMStreamParser : public StreamParser {
   StreamParserHost* host_;
 
   scoped_ptr<WebMClusterParser> cluster_parser_;
+  ByteQueue byte_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
 };