Cleanups in the video encoding decoding code. Reenable VP8.

remoting/host/session_manager_unittest.cc

Index: remoting/host/session_manager_unittest.cc
diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 9aa34d8ad849246919929677ff8d2b763f2b9ccd..f3870e2177ddeed1c0ef1a63a6d3b37b19ac181a 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -19,8 +19,9 @@ namespace remoting {
 
 static const int kWidth = 640;
 static const int kHeight = 480;
-static const PixelFormat kFormat = PixelFormatRgb32;
-static const UpdateStreamEncoding kEncoding = EncodingNone;
+static const PixelFormat kFormat = PIXEL_FORMAT_RGB32;
+static const VideoPacketFormat::Encoding kEncoding =
+    VideoPacketFormat::ENCODING_VERBATIM;
 
 class SessionManagerTest : public testing::Test {
  public:
@@ -64,10 +65,7 @@ ACTION_P2(RunCallback, rects, data) {
 }
 
 ACTION_P(FinishEncode, msg) {
-  Encoder::EncodingState state = (Encoder::EncodingStarting |
-                                  Encoder::EncodingInProgress |
-                                  Encoder::EncodingEnded);
-  arg2->Run(msg, state);
+  arg2->Run(msg);
   delete arg2;
 }
 
@@ -98,14 +96,12 @@ TEST_F(SessionManagerTest, DISABLED_OneRecordCycle) {
       .WillOnce(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
-  ChromotingHostMessage* msg = new ChromotingHostMessage();
+  VideoPacket* packet = new VideoPacket();
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
-      .WillOnce(FinishEncode(msg));
+      .WillOnce(FinishEncode(packet));
 
   // Expect the client be notified.
-  EXPECT_CALL(*client_, SendBeginUpdateStreamMessage());
-  EXPECT_CALL(*client_, SendUpdateStreamPacketMessage(_));
-  EXPECT_CALL(*client_, SendEndUpdateStreamMessage());
+  EXPECT_CALL(*client_, SendVideoPacket(_));
   EXPECT_CALL(*client_, GetPendingUpdateStreamMessages())
       .Times(AtLeast(0))
       .WillRepeatedly(Return(0));