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

remoting/protocol/message_decoder_unittest.cc

Index: remoting/protocol/message_decoder_unittest.cc
===================================================================
--- remoting/protocol/message_decoder_unittest.cc	(revision 64676)
+++ remoting/protocol/message_decoder_unittest.cc	(working copy)
@@ -41,10 +41,20 @@
 
   // Then append 10 update sequences to the data.
   for (int i = 0; i < 10; ++i) {
-    msg.mutable_video_packet()->set_sequence_number(0);
-    msg.mutable_video_packet()->set_data(kTestData);
+    msg.mutable_begin_update_stream();
     AppendMessage(msg, &encoded_data);
     msg.Clear();
+
+    msg.mutable_update_stream_packet()->mutable_rect_data()->
+        set_sequence_number(0);
+    msg.mutable_update_stream_packet()->mutable_rect_data()->
+        set_data(kTestData);
+    AppendMessage(msg, &encoded_data);
+    msg.Clear();
+
+    msg.mutable_end_update_stream();
+    AppendMessage(msg, &encoded_data);
+    msg.Clear();
   }
 
   *size = encoded_data.length();
@@ -80,19 +90,30 @@
   }
 
   // Then verify the decoded messages.
-  EXPECT_EQ(11u, message_list.size());
+  EXPECT_EQ(31u, message_list.size());
   EXPECT_TRUE(message_list.front()->has_init_client());
   delete message_list.front();
   message_list.pop_front();
 
+  int index = 0;
   for (std::list<ChromotingHostMessage*>::iterator it =
            message_list.begin();
        it != message_list.end(); ++it) {
     ChromotingHostMessage* message = *it;
-    // Partial update stream.
-    EXPECT_TRUE(message->has_video_packet());
-    EXPECT_EQ(kTestData,
-              message->video_packet().data().data());
+    int type = index % 3;
+    ++index;
+    if (type == 0) {
+      // Begin update stream.
+      EXPECT_TRUE(message->has_begin_update_stream());
+    } else if (type == 1) {
+      // Partial update stream.
+      EXPECT_TRUE(message->has_update_stream_packet());
+      EXPECT_EQ(kTestData,
+                message->update_stream_packet().rect_data().data());
+    } else if (type == 2) {
+      // End update stream.
+      EXPECT_TRUE(message->has_end_update_stream());
+    }
   }
   STLDeleteElements(&message_list);
 }