Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8....

remoting/base/decoder.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.
 
 #ifndef REMOTING_BASE_DECODER_H_
 #define REMOTING_BASE_DECODER_H_
 
 #include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
-#include "remoting/proto/video.pb.h"
+#include "remoting/proto/event.pb.h"
 
 namespace remoting {
 
 typedef std::vector<gfx::Rect> UpdatedRects;
 
 // Interface for a decoder that takes a stream of bytes from the network and
 // outputs frames of data.
 //
 // TODO(ajwong): Beef up this documentation once the API stablizes.
 class Decoder {
@@ skipping 21 matching lines @@
   // the initialized |frame|.  Initialize() must be called before the decoder
   // is used again.
   virtual void Reset() = 0;
 
   // Feeds more data into the decoder.
   virtual void DecodeBytes(const std::string& encoded_bytes) = 0;
 
   // Returns true if decoder is ready to accept data via ProcessRectangleData.
   virtual bool IsReadyForData() = 0;
 
-  virtual VideoPacketFormat::Encoding Encoding() = 0;
+  virtual UpdateStreamEncoding Encoding() = 0;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_DECODER_H_