Switch remoting/protocol to new callbacks

remoting/protocol/protocol_mock_objects.h

 // 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_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"
@@ skipping 52 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInputStub);
 };
 
 class MockHostStub : public HostStub {
  public:
   MockHostStub();
   ~MockHostStub();
 
   MOCK_METHOD2(BeginSessionRequest,
-               void(const LocalLoginCredentials* credentials, Task* done));
+               void(const LocalLoginCredentials* credentials,
+                    const base::Closure&  done));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockHostStub);
 };
 
 class MockClientStub : public ClientStub {
  public:
   MockClientStub();
   virtual ~MockClientStub();
 
   MOCK_METHOD2(NotifyResolution, void(const NotifyResolutionRequest* msg,
-                                      Task* done));
+                                      const base::Closure& done));
   MOCK_METHOD2(BeginSessionResponse, void(const LocalLoginStatus* msg,
-                                          Task* done));
+                                          const base::Closure& done));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientStub);
 };
 
 class MockVideoStub : public VideoStub {
  public:
   MockVideoStub();
   virtual ~MockVideoStub();
 
   MOCK_METHOD2(ProcessVideoPacket, void(const VideoPacket* video_packet,
-                                        Task* done));
+                                        const base::Closure& done));
   MOCK_METHOD0(GetPendingPackets, int());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoStub);
 };
 
 class MockSession : public Session {
  public:
   MockSession();
   virtual ~MockSession();
 
-  MOCK_METHOD1(SetStateChangeCallback, void(StateChangeCallback* callback));
+  MOCK_METHOD1(SetStateChangeCallback,
+               void(const StateChangeCallback& callback));
   MOCK_METHOD0(error, Session::Error());
   MOCK_METHOD2(CreateStreamChannel, void(
       const std::string& name, const StreamChannelCallback& callback));
   MOCK_METHOD2(CreateDatagramChannel, void(
       const std::string& name, const DatagramChannelCallback& 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*());
@@ skipping 10 matching lines @@
   MOCK_METHOD0(Close, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_