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

remoting/base/codec_test.cc

 // 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.
 
 #include <deque>
 #include <stdlib.h>
 
 #include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/codec_test.h"
@@ skipping 299 matching lines @@
   EncoderStateTester* state_tester_;
   DecoderTester* decoder_tester_;
   int data_available_;
 
   DISALLOW_COPY_AND_ASSIGN(EncoderTester);
 };
 
 scoped_refptr<CaptureData> PrepareEncodeData(PixelFormat format,
                                              uint8** memory) {
   // TODO(hclam): Support also YUV format.
-  CHECK(format == PIXEL_FORMAT_RGB32);
+  CHECK(format == PixelFormatRgb32);
   int size = kWidth * kHeight * kBytesPerPixel;
 
   *memory = new uint8[size];
   srand(0);
   for (int i = 0; i < size; ++i) {
     (*memory)[i] = rand() % 256;
   }
 
   DataPlanes planes;
   memset(planes.data, 0, sizeof(planes.data));
@@ skipping 22 matching lines @@
 
 void TestEncoder(Encoder* encoder, bool strict) {
   EncoderMessageTester message_tester;
   message_tester.set_strict(strict);
 
   EncoderStateTester state_tester;
   EncoderTester tester(&message_tester, &state_tester);
 
   uint8* memory;
   scoped_refptr<CaptureData> data =
-      PrepareEncodeData(PIXEL_FORMAT_RGB32, &memory);
+      PrepareEncodeData(PixelFormatRgb32, &memory);
 
   TestEncodingRects(encoder, &tester, data, kTestRects, 1);
   TestEncodingRects(encoder, &tester, data, kTestRects + 1, 1);
   TestEncodingRects(encoder, &tester, data, kTestRects + 2, 1);
   TestEncodingRects(encoder, &tester, data, kTestRects + 3, 2);
   delete [] memory;
 }
 
 static void TestEncodingRects(Encoder* encoder,
                               EncoderTester* encoder_tester,
@@ skipping 31 matching lines @@
 
 void TestEncoderDecoder(Encoder* encoder, Decoder* decoder, bool strict) {
   EncoderMessageTester message_tester;
   message_tester.set_strict(strict);
 
   EncoderStateTester state_tester;
   EncoderTester encoder_tester(&message_tester, &state_tester);
 
   uint8* memory;
   scoped_refptr<CaptureData> data =
-      PrepareEncodeData(PIXEL_FORMAT_RGB32, &memory);
+      PrepareEncodeData(PixelFormatRgb32, &memory);
   DecoderTester decoder_tester(decoder);
   decoder_tester.set_strict(strict);
   decoder_tester.set_capture_data(data);
   encoder_tester.set_decoder_tester(&decoder_tester);
 
   TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data,
                     kTestRects, 1);
   TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data,
                     kTestRects + 1, 1);
   TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data,
                     kTestRects + 2, 1);
   TestEncodingRects(encoder, &encoder_tester, &decoder_tester, data,
                     kTestRects + 3, 2);
   delete [] memory;
 }
 
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::DecoderTester);