More out-of-lining of test code, along with a bunch of GMOCK objects.

remoting/protocol/protocol_mock_objects.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_PROTOCOL_MOCK_OBJECTS_H_
-#define REMOTING_PROTOCOL_MOCK_OBJECTS_H_
+#ifndef REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
+#define REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/video_stub.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace remoting {
 namespace protocol {
 
 class ChromotocolConnection;
 
 class MockConnectionToClient : public ConnectionToClient {
  public:
-  MockConnectionToClient() {}
+  MockConnectionToClient();
+  virtual ~MockConnectionToClient();
 
   MOCK_METHOD1(Init, void(Session* session));
   MOCK_METHOD0(video_stub, VideoStub*());
   MOCK_METHOD0(client_stub, ClientStub*());
   MOCK_METHOD0(session, Session*());
   MOCK_METHOD0(Disconnect, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockConnectionToClient);
 };
 
 class MockConnectionToClientEventHandler :
-  public ConnectionToClient::EventHandler {
+      public ConnectionToClient::EventHandler {
  public:
-  MockConnectionToClientEventHandler() {}
+  MockConnectionToClientEventHandler();
+  virtual ~MockConnectionToClientEventHandler();
 
   MOCK_METHOD1(OnConnectionOpened, void(ConnectionToClient* connection));
   MOCK_METHOD1(OnConnectionClosed, void(ConnectionToClient* connection));
   MOCK_METHOD1(OnConnectionFailed, void(ConnectionToClient* connection));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockConnectionToClientEventHandler);
 };
 
 class MockInputStub : public InputStub {
  public:
-  MockInputStub() {}
+  MockInputStub();
+  virtual ~MockInputStub();
 
   MOCK_METHOD2(InjectKeyEvent, void(const KeyEvent* event, Task* done));
   MOCK_METHOD2(InjectMouseEvent, void(const MouseEvent* event, Task* done));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInputStub);
 };
 
 class MockHostStub : public HostStub {
  public:
-  MockHostStub() {}
+  MockHostStub();
+  ~MockHostStub();
 
   MOCK_METHOD2(SuggestResolution, void(const SuggestResolutionRequest* msg,
                                        Task* done));
   MOCK_METHOD2(BeginSessionRequest,
                void(const LocalLoginCredentials* credentials, Task* done));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockHostStub);
 };
 
 class MockClientStub : public ClientStub {
  public:
-  MockClientStub() {}
+  MockClientStub();
+  virtual ~MockClientStub();
 
   MOCK_METHOD2(NotifyResolution, void(const NotifyResolutionRequest* msg,
                                       Task* done));
   MOCK_METHOD2(BeginSessionResponse, void(const LocalLoginStatus* msg,
                                           Task* done));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientStub);
 };
 
 class MockVideoStub : public VideoStub {
  public:
-  MockVideoStub() {}
+  MockVideoStub();
+  virtual ~MockVideoStub();
 
   MOCK_METHOD2(ProcessVideoPacket, void(const VideoPacket* video_packet,
                                         Task* done));
   MOCK_METHOD0(GetPendingPackets, int());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoStub);
 };
 
 class MockSession : public Session {
  public:
-  MockSession() {}
+  MockSession();
+  virtual ~MockSession();
 
   MOCK_METHOD1(SetStateChangeCallback, void(StateChangeCallback* callback));
   MOCK_METHOD0(control_channel, net::Socket*());
   MOCK_METHOD0(event_channel, net::Socket*());
   MOCK_METHOD0(video_channel, net::Socket*());
   MOCK_METHOD0(video_rtp_channel, net::Socket*());
   MOCK_METHOD0(video_rtcp_channel, net::Socket*());
   MOCK_METHOD0(jid, const std::string&());
   MOCK_METHOD0(message_loop, MessageLoop*());
   MOCK_METHOD0(candidate_config, const CandidateSessionConfig*());
   MOCK_METHOD0(config, const SessionConfig*());
   MOCK_METHOD1(set_config, void(const SessionConfig* config));
   MOCK_METHOD0(initiator_token, const std::string&());
   MOCK_METHOD1(set_initiator_token, void(const std::string& initiator_token));
   MOCK_METHOD0(receiver_token, const std::string&());
   MOCK_METHOD1(set_receiver_token, void(const std::string& receiver_token));
   MOCK_METHOD1(Close, void(Task* closed_task));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_PROTOCOL_MOCK_OBJECTS_H_
+#endif  // REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_