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

remoting/host/session_manager.h

Index: remoting/host/session_manager.h
===================================================================
--- remoting/host/session_manager.h	(revision 64676)
+++ remoting/host/session_manager.h	(working copy)
@@ -14,7 +14,8 @@
 #include "base/time.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/capturer.h"
-#include "remoting/proto/video.pb.h"
+// TODO(hclam): This class should not know the internal protobuf types.
+#include "remoting/proto/internal.pb.h"
 
 namespace remoting {
 
@@ -125,7 +126,8 @@
   void DoRateControl();
 
   // DoSendUpdate takes ownership of header and is responsible for deleting it.
-  void DoSendVideoPacket(VideoPacket* packet);
+  void DoSendUpdate(ChromotingHostMessage* message,
+                    Encoder::EncodingState state);
   void DoSendInit(scoped_refptr<ClientConnection> client,
                   int width, int height);
 
@@ -139,7 +141,8 @@
 
   // EncodeDataAvailableTask takes ownership of header and is responsible for
   // deleting it.
-  void EncodeDataAvailableTask(VideoPacket* packet);
+  void EncodeDataAvailableTask(ChromotingHostMessage* message,
+                               Encoder::EncodingState state);
 
   // Message loops used by this class.
   MessageLoop* capture_loop_;