Switching some interfaces to use std::unique_ptr<>.

webrtc/pc/videocapturertracksource_unittest.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 91 matching lines @@
 
  private:
   MediaSourceInterface::SourceState state_;
   rtc::scoped_refptr<VideoTrackSourceInterface> source_;
 };
 
 class VideoCapturerTrackSourceTest : public testing::Test {
  protected:
   VideoCapturerTrackSourceTest() { InitCapturer(false); }
   void InitCapturer(bool is_screencast) {
-    capturer_cleanup_ = std::unique_ptr<TestVideoCapturer>(
-        new TestVideoCapturer(is_screencast));
-    capturer_ = capturer_cleanup_.get();
+    capturer_ = new TestVideoCapturer(is_screencast);
+    capturer_cleanup_.reset(capturer_);
   }
 
   void InitScreencast() { InitCapturer(true); }
 
   void CreateVideoCapturerSource() { CreateVideoCapturerSource(NULL); }
 
   void CreateVideoCapturerSource(
       const webrtc::MediaConstraintsInterface* constraints) {
-    // VideoSource take ownership of |capturer_|
     source_ = VideoCapturerTrackSource::Create(rtc::Thread::Current(),
-                                               capturer_cleanup_.release(),
+                                               std::move(capturer_cleanup_),
                                                constraints, false);
 
     ASSERT_TRUE(source_.get() != NULL);
 
     state_observer_.reset(new StateObserver(source_));
     source_->RegisterObserver(state_observer_.get());
     source_->AddOrUpdateSink(&renderer_, rtc::VideoSinkWants());
   }
 
-  std::unique_ptr<TestVideoCapturer> capturer_cleanup_;
+  std::unique_ptr<cricket::VideoCapturer> capturer_cleanup_;
   TestVideoCapturer* capturer_;
   cricket::FakeVideoRenderer renderer_;
   std::unique_ptr<StateObserver> state_observer_;
   rtc::scoped_refptr<VideoTrackSourceInterface> source_;
 };
 
 // Test that a VideoSource transition to kLive state when the capture
 // device have started and kEnded if it is stopped.
 // It also test that an output can receive video frames.
 TEST_F(VideoCapturerTrackSourceTest, CapturerStartStop) {
@@ skipping 311 matching lines @@
   FakeConstraints constraints;
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
 
   CreateVideoCapturerSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(1, format->framerate());
 }