Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.

webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc

 /*
  *  Copyright (c) 2013 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 60 matching lines @@
   return frame;
 }
 
 class FakeScreenCapturer : public DesktopCapturer {
  public:
   FakeScreenCapturer() {}
 
   void Start(Callback* callback) override { callback_ = callback; }
 
   void Capture(const DesktopRegion& region) override {
-    callback_->OnCaptureResult(
-        next_frame_ ? Result::SUCCESS : Result::ERROR_TEMPORARY,
-        std::move(next_frame_));
+    callback_->OnCaptureCompleted(next_frame_.release());
   }
 
-  void SetNextFrame(std::unique_ptr<DesktopFrame> next_frame) {
-    next_frame_ = std::move(next_frame);
+  void SetNextFrame(DesktopFrame* next_frame) {
+    next_frame_.reset(next_frame);
   }
 
  private:
-  Callback* callback_ = nullptr;
+  Callback* callback_;
 
   std::unique_ptr<DesktopFrame> next_frame_;
 };
 
 class FakeMouseMonitor : public MouseCursorMonitor {
  public:
   FakeMouseMonitor() : changed_(true) {}
 
   void SetState(CursorState state, const DesktopVector& pos) {
     state_ = state;
@@ skipping 58 matching lines @@
     }
   }
 }
 
 class DesktopAndCursorComposerTest : public testing::Test,
                                      public DesktopCapturer::Callback {
  public:
   DesktopAndCursorComposerTest()
       : fake_screen_(new FakeScreenCapturer()),
         fake_cursor_(new FakeMouseMonitor()),
-        blender_(fake_screen_, fake_cursor_) {}
+        blender_(fake_screen_, fake_cursor_) {
+  }
 
   // DesktopCapturer::Callback interface
-  void OnCaptureResult(DesktopCapturer::Result result,
-                       std::unique_ptr<DesktopFrame> frame) override {
-    frame_ = std::move(frame);
-  }
+  void OnCaptureCompleted(DesktopFrame* frame) override { frame_.reset(frame); }
 
  protected:
   // Owned by |blender_|.
   FakeScreenCapturer* fake_screen_;
   FakeMouseMonitor* fake_cursor_;
 
   DesktopAndCursorComposer blender_;
   std::unique_ptr<DesktopFrame> frame_;
 };
 
 // Verify DesktopAndCursorComposer can handle the case when the screen capturer
 // fails.
 TEST_F(DesktopAndCursorComposerTest, Error) {
   blender_.Start(this);
 
   fake_cursor_->SetHotspot(DesktopVector());
   fake_cursor_->SetState(MouseCursorMonitor::INSIDE, DesktopVector());
-  fake_screen_->SetNextFrame(nullptr);
+  fake_screen_->SetNextFrame(NULL);
 
   blender_.Capture(DesktopRegion());
 
   EXPECT_FALSE(frame_);
 }
 
 TEST_F(DesktopAndCursorComposerTest, Blend) {
   struct {
     int x, y;
     int hotspot_x, hotspot_y;
@@ skipping 39 matching lines @@
     // Verify that the cursor is erased before the frame buffer is returned to
     // the screen capturer.
     frame_.reset();
     VerifyFrame(*frame, MouseCursorMonitor::OUTSIDE, DesktopVector());
   }
 }
 
 }  // namespace
 
 }  // namespace webrtc