diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:34:22 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:34:22 +0000 |
| commit | 5485707a47aae11be217650d721913a096825852 (patch) | |
| tree | 5c69203d3ea27c23b0f884ada6bb29c485b1925e /remoting | |
| parent | c87dfdab742620a0a602e1204925728adf92063c (diff) | |
| download | chromium_src-5485707a47aae11be217650d721913a096825852.zip chromium_src-5485707a47aae11be217650d721913a096825852.tar.gz chromium_src-5485707a47aae11be217650d721913a096825852.tar.bz2 | |
Remove various DoNothing functions in favor of base::DoNothing
BUG=
TBR=yoz@chromium.org,rkc@chromium.org,sergeyu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11361269
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 6333e24..b983f81 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "remoting/base/auto_thread_task_runner.h" @@ -61,9 +62,6 @@ ACTION(RunDoneTask) { arg1.Run(); } -void DoNothing() { -} - } // namespace class MockIt2MeHostUserInterface : public It2MeHostUserInterface { @@ -520,7 +518,7 @@ TEST_F(ChromotingHostTest, Connect) { Expectation video_packet_sent = ExpectClientConnected( 0, InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); Expectation client_disconnected = ExpectClientDisconnected( - 0, true, video_packet_sent, InvokeWithoutArgs(DoNothing)); + 0, true, video_packet_sent, InvokeWithoutArgs(base::DoNothing)); EXPECT_CALL(host_status_observer_, OnShutdown()).After(client_disconnected); host_->Start(xmpp_login_); @@ -563,14 +561,14 @@ TEST_F(ChromotingHostTest, Reconnect) { InvokeWithoutArgs(this, &ChromotingHostTest::DisconnectClient1), InvokeWithoutArgs(this, &ChromotingHostTest::QuitMainMessageLoop))); ExpectClientDisconnectEffects( - 0, true, video_packet_sent1, InvokeWithoutArgs(DoNothing)); + 0, true, video_packet_sent1, InvokeWithoutArgs(base::DoNothing)); // When a video packet is received on the second connection, shut down the // host. Expectation video_packet_sent2 = ExpectClientConnected( 1, InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); Expectation client_disconnected2 = ExpectClientDisconnected( - 1, true, video_packet_sent2, InvokeWithoutArgs(DoNothing)); + 1, true, video_packet_sent2, InvokeWithoutArgs(base::DoNothing)); EXPECT_CALL(host_status_observer_, OnShutdown()).After(client_disconnected2); host_->Start(xmpp_login_); @@ -592,11 +590,11 @@ TEST_F(ChromotingHostTest, ConnectWhenAnotherClientIsConnected) { this, &ChromotingHostTest::SimulateClientConnection, 1, true, false))); ExpectClientDisconnected( - 0, true, video_packet_sent1, InvokeWithoutArgs(DoNothing)); + 0, true, video_packet_sent1, InvokeWithoutArgs(base::DoNothing)); Expectation video_packet_sent2 = ExpectClientConnected( 1, InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); Expectation client_disconnected2 = ExpectClientDisconnected( - 1, true, video_packet_sent2, InvokeWithoutArgs(DoNothing)); + 1, true, video_packet_sent2, InvokeWithoutArgs(base::DoNothing)); EXPECT_CALL(host_status_observer_, OnShutdown()).After(client_disconnected2); host_->Start(xmpp_login_); @@ -690,7 +688,8 @@ TEST_F(ChromotingHostTest, OnSessionRouteChange) { session_jid1_, channel_name, _)) .After(video_packet_sent) .WillOnce(InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); - ExpectClientDisconnected(0, true, route_change, InvokeWithoutArgs(DoNothing)); + ExpectClientDisconnected(0, true, route_change, + InvokeWithoutArgs(base::DoNothing)); EXPECT_CALL(host_status_observer_, OnShutdown()); host_->Start(xmpp_login_); |