Cleanup usage of scoped_ptr<> in remoting for C++11

remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 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/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 384 matching lines @@
   scoped_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory(
       new MockDesktopEnvironmentFactory());
   EXPECT_CALL(*desktop_environment_factory, CreatePtr())
       .Times(AnyNumber())
       .WillRepeatedly(Invoke(
           this, &IpcDesktopEnvironmentTest::CreateDesktopEnvironment));
   EXPECT_CALL(*desktop_environment_factory, SupportsAudioCapture())
       .Times(AnyNumber())
       .WillRepeatedly(Return(false));
 
-  EXPECT_TRUE(desktop_process_->Start(
-      desktop_environment_factory.PassAs<DesktopEnvironmentFactory>()));
+  EXPECT_TRUE(desktop_process_->Start(desktop_environment_factory.Pass()));
 }
 
 void IpcDesktopEnvironmentTest::DestoyDesktopProcess() {
   desktop_channel_.reset();
   if (desktop_process_) {
     desktop_process_->OnChannelError();
     desktop_process_.reset();
   }
   remote_input_injector_ = NULL;
 }
@@ skipping 11 matching lines @@
 }
 
 // Runs until the desktop is attached and exits immediately after that.
 TEST_F(IpcDesktopEnvironmentTest, Basic) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Stop the test.
   DeleteDesktopEnvironment();
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests that the video capturer receives a frame over IPC.
 TEST_F(IpcDesktopEnvironmentTest, CaptureFrame) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Stop the test when the first frame is captured.
   EXPECT_CALL(desktop_capturer_callback_, OnCaptureCompleted(_))
       .WillOnce(DoAll(
           DeleteArg<0>(),
           InvokeWithoutArgs(
               this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)));
 
   // Capture a single frame.
   video_capturer_->Capture(webrtc::DesktopRegion());
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests that attaching to a new desktop works.
 TEST_F(IpcDesktopEnvironmentTest, Reattach) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Create and start a new desktop process object.
   setup_run_loop_.reset(new base::RunLoop());
   DestoyDesktopProcess();
   CreateDesktopProcess();
   setup_run_loop_->Run();
@@ skipping 12 matching lines @@
       new protocol::MockClipboardStub());
   clipboard_stub_ = clipboard_stub.get();
 
   // Stop the test when a clipboard event is received from the desktop process.
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(1)
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single clipboard event.
   EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(1)
       .WillOnce(Invoke(this,
                        &IpcDesktopEnvironmentTest::ReflectClipboardEvent));
@@ skipping 10 matching lines @@
 }
 
 // Tests injection of key events.
 TEST_F(IpcDesktopEnvironmentTest, InjectKeyEvent) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single key event.
   EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(AtLeast(1))
       .WillRepeatedly(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
@@ skipping 10 matching lines @@
 }
 
 // Tests injection of text events.
 TEST_F(IpcDesktopEnvironmentTest, InjectTextEvent) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single text event.
   EXPECT_CALL(*remote_input_injector_, InjectTextEvent(_))
       .Times(AtLeast(1))
       .WillRepeatedly(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Send a text event.
   protocol::TextEvent event;
   event.set_text("hello");
   input_injector_->InjectTextEvent(event);
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests injection of mouse events.
 TEST_F(IpcDesktopEnvironmentTest, InjectMouseEvent) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single mouse event.
   EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(1)
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
@@ skipping 10 matching lines @@
 }
 
 // Tests that setting the desktop resolution works.
 TEST_F(IpcDesktopEnvironmentTest, SetScreenResolution) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
   // Start the input injector and screen capturer.
-  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  input_injector_->Start(clipboard_stub.Pass());
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   EXPECT_CALL(daemon_channel_, SetScreenResolution(_, _))
       .Times(1)
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Change the desktop resolution.
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting