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

remoting/host/mock_objects.h

 // 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.
 
 #ifndef REMOTING_HOST_MOCK_OBJECTS_H_
 #define REMOTING_HOST_MOCK_OBJECTS_H_
 
 #include "remoting/host/capturer.h"
 #include "remoting/host/client_connection.h"
 #include "remoting/host/event_executor.h"
@@ skipping 29 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventExecutor);
 };
 
 class MockClientConnection : public ClientConnection {
  public:
   MockClientConnection(){}
 
   MOCK_METHOD1(Init, void(ChromotingConnection* connection));
   MOCK_METHOD2(SendInitClientMessage, void(int width, int height));
-  MOCK_METHOD1(SendVideoPacket, void(const VideoPacket& packet));
+  MOCK_METHOD0(SendBeginUpdateStreamMessage, void());
+  MOCK_METHOD1(SendUpdateStreamPacketMessage,
+               void(const ChromotingHostMessage& message));
+  MOCK_METHOD0(SendEndUpdateStreamMessage, void());
   MOCK_METHOD0(GetPendingUpdateStreamMessages, int());
   MOCK_METHOD0(Disconnect, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientConnection);
 };
 
 class MockClientConnectionEventHandler : public ClientConnection::EventHandler {
  public:
   MockClientConnectionEventHandler() {}
 
   MOCK_METHOD2(HandleMessage,
                void(ClientConnection* viewer,
                     ChromotingClientMessage* message));
   MOCK_METHOD1(OnConnectionOpened, void(ClientConnection* viewer));
   MOCK_METHOD1(OnConnectionClosed, void(ClientConnection* viewer));
   MOCK_METHOD1(OnConnectionFailed, void(ClientConnection* viewer));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientConnectionEventHandler);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_MOCK_OBJECTS_H_