Stop using some scoped_ptr features that unique_ptr doesn't have

webrtc/modules/desktop_capture/desktop_frame.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 70 matching lines @@
 rtc::scoped_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
     DesktopSize size,
     SharedMemoryFactory* shared_memory_factory) {
   size_t buffer_size =
       size.width() * size.height() * DesktopFrame::kBytesPerPixel;
   rtc::scoped_ptr<SharedMemory> shared_memory;
   shared_memory = shared_memory_factory->CreateSharedMemory(buffer_size);
   if (!shared_memory)
     return nullptr;
 
-  return rtc_make_scoped_ptr(new SharedMemoryDesktopFrame(
+  return rtc::scoped_ptr<DesktopFrame>(new SharedMemoryDesktopFrame(
       size, size.width() * DesktopFrame::kBytesPerPixel,
       std::move(shared_memory)));
 }
 
 SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(DesktopSize size,
                                                    int stride,
                                                    SharedMemory* shared_memory)
     : DesktopFrame(size,
                    stride,
                    reinterpret_cast<uint8_t*>(shared_memory->data()),
                    shared_memory) {}
 
 SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(
     DesktopSize size,
     int stride,
     rtc::scoped_ptr<SharedMemory> shared_memory)
     : DesktopFrame(size,
                    stride,
                    reinterpret_cast<uint8_t*>(shared_memory->data()),
                    shared_memory.release()) {}
 
 SharedMemoryDesktopFrame::~SharedMemoryDesktopFrame() {
   delete shared_memory_;
 }
 
 }  // namespace webrtc