Switch remoting/protocol to new callbacks

remoting/host/client_session_unittest.cc

 // 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.
 
 #include "remoting/host/client_session.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
-namespace {
-
-// A task that does nothing.
-class DummyTask : public Task {
- public:
-  void Run() {}
-};
-
-}  // namespace
-
 using protocol::MockConnectionToClient;
 using protocol::MockConnectionToClientEventHandler;
 using protocol::MockHostStub;
 using protocol::MockInputStub;
 using protocol::MockSession;
 
 using testing::_;
 using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
@@ skipping 92 matching lines @@
       .WillOnce(Return(true));
   EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
   EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(2, true)));
   EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(2, false)));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(200, 201)));
 
   // These events should not get through to the input stub,
   // because the client isn't authenticated yet.
   client_session_->InjectKeyEvent(key_event1);
   client_session_->InjectMouseEvent(mouse_event1);
-  client_session_->BeginSessionRequest(&credentials, new DummyTask());
+  client_session_->BeginSessionRequest(&credentials, base::Closure());
   // These events should get through to the input stub.
   client_session_->InjectKeyEvent(key_event2_down);
   client_session_->InjectKeyEvent(key_event2_up);
   client_session_->InjectMouseEvent(mouse_event2);
   client_session_->OnDisconnected();
   // These events should not get through to the input stub,
   // because the client has disconnected.
   client_session_->InjectKeyEvent(key_event3);
   client_session_->InjectMouseEvent(mouse_event3);
 }
@@ skipping 14 matching lines @@
   credentials.set_username("user");
   credentials.set_credential("password");
 
   InSequence s;
   EXPECT_CALL(*user_authenticator_, Authenticate(_, _))
       .WillOnce(Return(true));
   EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(100, 101)));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(200, 201)));
 
-  client_session_->BeginSessionRequest(&credentials, new DummyTask());
+  client_session_->BeginSessionRequest(&credentials, base::Closure());
   // This event should get through to the input stub.
   client_session_->InjectMouseEvent(mouse_event1);
   // This one should too because the local event echoes the remote one.
   client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
                                                   mouse_event1.y()));
   client_session_->InjectMouseEvent(mouse_event2);
   // This one should not.
   client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
                                                   mouse_event1.y()));
   client_session_->InjectMouseEvent(mouse_event3);
@@ skipping 32 matching lines @@
   EXPECT_CALL(capturer_, size_most_recent())
       .WillRepeatedly(ReturnRef(screen));
 
   protocol::LocalLoginCredentials credentials;
   credentials.set_type(protocol::PASSWORD);
   credentials.set_username("user");
   credentials.set_credential("password");
   EXPECT_CALL(*user_authenticator_, Authenticate(_, _))
       .WillOnce(Return(true));
   EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
-  client_session_->BeginSessionRequest(&credentials, new DummyTask());
+  client_session_->BeginSessionRequest(&credentials, base::Closure());
 
   int input_x[3] = { -999, 100, 999 };
   int expected_x[3] = { 0, 100, 199 };
   int input_y[3] = { -999, 50, 999 };
   int expected_y[3] = { 0, 50, 99 };
 
   protocol::MouseEvent event;
   for (int j = 0; j < 3; j++) {
     for (int i = 0; i < 3; i++) {
       event.set_x(input_x[i]);
       event.set_y(input_y[j]);
       EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(
           expected_x[i], expected_y[j])));
       client_session_->InjectMouseEvent(event);
     }
   }
 }
 
 }  // namespace remoting