Refactor VideoStub interface to accept ownership of video packets.

remoting/protocol/connection_to_client_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/base/base_mock_objects.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/fake_session.h"
@@ skipping 45 matching lines @@
   scoped_ptr<ConnectionToClient> viewer_;
 
   // Owned by |viewer_|.
   protocol::FakeSession* session_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClientTest);
 };
 
 TEST_F(ConnectionToClientTest, SendUpdateStream) {
-  // Then send the actual data.
-  VideoPacket* packet = new VideoPacket();
-  viewer_->video_stub()->ProcessVideoPacket(
-      packet, base::Bind(&base::DeletePointer<VideoPacket>, packet));
+  scoped_ptr<VideoPacket> packet(new VideoPacket());
+  viewer_->video_stub()->ProcessVideoPacket(packet.Pass(), base::Closure());
 
   message_loop_.RunAllPending();
 
   // Verify that something has been written.
   // TODO(sergeyu): Verify that the correct data has been written.
   ASSERT_TRUE(session_->GetStreamChannel(kVideoChannelName));
   EXPECT_GT(session_->GetStreamChannel(kVideoChannelName)->
             written_data().size(), 0u);
 
   // And then close the connection to ConnectionToClient.
   viewer_->Disconnect();
 
   message_loop_.RunAllPending();
 }
 
 TEST_F(ConnectionToClientTest, NoWriteAfterDisconnect) {
-  // Then send the actual data.
-  VideoPacket* packet = new VideoPacket();
-  viewer_->video_stub()->ProcessVideoPacket(
-      packet, base::Bind(&base::DeletePointer<VideoPacket>, packet));
+  scoped_ptr<VideoPacket> packet(new VideoPacket());
+  viewer_->video_stub()->ProcessVideoPacket(packet.Pass(), base::Closure());
 
   // And then close the connection to ConnectionToClient.
   viewer_->Disconnect();
 
   // The test will crash if data writer tries to write data to the
   // channel socket.
   // TODO(sergeyu): Use MockSession to verify that no data is written?
   message_loop_.RunAllPending();
 }
 
 TEST_F(ConnectionToClientTest, StateChange) {
   EXPECT_CALL(handler_, OnConnectionClosed(viewer_.get()));
   session_->state_change_callback().Run(protocol::Session::CLOSED);
   message_loop_.RunAllPending();
 
   EXPECT_CALL(handler_, OnConnectionFailed(viewer_.get(), SESSION_REJECTED));
   session_->set_error(SESSION_REJECTED);
   session_->state_change_callback().Run(protocol::Session::FAILED);
   message_loop_.RunAllPending();
 }
 
 }  // namespace protocol
 }  // namespace remoting