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

remoting/client/chromoting_view_unittest.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 "base/scoped_ptr.h"
 #include "remoting/base/decoder.h"
 #include "remoting/client/chromoting_view.h"
 #include "remoting/proto/internal.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Return;
 
 namespace remoting {
 
 class MockDecoder : public Decoder {
  public:
   MockDecoder() {}
 
   MOCK_METHOD4(BeginDecode, bool(scoped_refptr<media::VideoFrame> frame,
                                  UpdatedRects* updated_rects,
                                  Task* partial_decode_done,
                                  Task* decode_done));
   MOCK_METHOD1(PartialDecode, bool(ChromotingHostMessage* message));
   MOCK_METHOD0(EndDecode, void());
 
-  MOCK_METHOD0(Encoding, VideoPacketFormat::Encoding());
+  MOCK_METHOD0(Encoding, UpdateStreamEncoding());
   MOCK_METHOD0(IsStarted, bool());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDecoder);
 };
 
 // Fake ChromotingView that provides stub implementations for all pure virtual
 // methods. This is sufficient since we're only interested in testing the
 // base class methods in this file.
 class FakeView : public ChromotingView {
@@ skipping 17 matching lines @@
   // These provide access to private/protected members of ChromotingView so
   // that they can be tested/verified.
   Decoder* get_decoder() {
     return decoder_.get();
   }
   void set_decoder(Decoder* decoder) {
     decoder_.reset(decoder);
   }
 
   // Testing wrappers for private setup/startup decoder routines.
-  bool setup_decoder(VideoPacketFormat::Encoding encoding) {
+  bool setup_decoder(UpdateStreamEncoding encoding) {
     return SetupDecoder(encoding);
   }
   bool begin_decoding(Task* partial_decode_done, Task* decode_done) {
     return BeginDecoding(partial_decode_done, decode_done);
   }
   bool decode(ChromotingHostMessage* msg) {
     return Decode(msg);
   }
   bool end_decoding() {
     return EndDecoding();
@@ skipping 473 matching lines @@
   EXPECT_FALSE(view->decode(NULL));
 }
 
 // Test requesting a decoder for an invalid encoding.
 TEST(ChromotingViewTest, InvalidEncoding) {
   scoped_ptr<FakeView> view(new FakeView());
   EXPECT_FALSE(view->setup_decoder(EncodingInvalid));
 }
 
 }  // namespace remoting