Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

 // Copyright 2015 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 "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 115 matching lines @@
         g_picker_factory->CreateModel(show_screens, show_windows, show_tabs,
                                       request_audio);
     screen_list = std::move(media_lists[0]);
     window_list = std::move(media_lists[1]);
     tab_list = std::move(media_lists[2]);
     picker_ = g_picker_factory->CreatePicker();
   } else {
     // Create a screens list.
     if (show_screens) {
 #if defined(USE_ASH)
-      screen_list = base::WrapUnique(
-          new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
+      screen_list =
+          base::MakeUnique<DesktopMediaListAsh>(DesktopMediaListAsh::SCREENS);
 #endif
       if (!screen_list) {
         webrtc::DesktopCaptureOptions options =
             webrtc::DesktopCaptureOptions::CreateDefault();
         options.set_disable_effects(false);
         std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
             webrtc::ScreenCapturer::Create(options));
 
-        screen_list = base::WrapUnique(
-            new NativeDesktopMediaList(std::move(screen_capturer), nullptr));
+        screen_list = base::MakeUnique<NativeDesktopMediaList>(
+            std::move(screen_capturer), nullptr);
       }
     }
 
     // Create a windows list.
     if (show_windows) {
 #if defined(USE_ASH)
-      window_list = base::WrapUnique(
-          new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
+      window_list =
+          base::MakeUnique<DesktopMediaListAsh>(DesktopMediaListAsh::WINDOWS);
 #endif
       if (!window_list) {
         webrtc::DesktopCaptureOptions options =
             webrtc::DesktopCaptureOptions::CreateDefault();
         options.set_disable_effects(false);
         std::unique_ptr<webrtc::WindowCapturer> window_capturer(
             webrtc::WindowCapturer::Create(options));
 
-        window_list = base::WrapUnique(
-            new NativeDesktopMediaList(nullptr, std::move(window_capturer)));
+        window_list = base::MakeUnique<NativeDesktopMediaList>(
+            nullptr, std::move(window_capturer));
       }
     }
 
     if (show_tabs)
-      tab_list = base::WrapUnique(new TabDesktopMediaList());
+      tab_list = base::MakeUnique<TabDesktopMediaList>();
 
     DCHECK(screen_list || window_list || tab_list);
 
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
@@ skipping 91 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions