| Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| index 617e6f0de07063bdcac588aaedb2f00389c38165..1ff843ad0e0fb9a863e48f1b68e4918a1ca6bb3c 100644
|
| --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| @@ -8,6 +8,7 @@
|
| #include <utility>
|
|
|
| #include "base/command_line.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| @@ -126,18 +127,18 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
|
|
|
| const gfx::NativeWindow parent_window =
|
| web_contents->GetTopLevelNativeWindow();
|
| - scoped_ptr<DesktopMediaList> media_list;
|
| + std::unique_ptr<DesktopMediaList> media_list;
|
| if (g_picker_factory) {
|
| media_list = g_picker_factory->CreateModel(show_screens, show_windows,
|
| show_tabs, request_audio);
|
| picker_ = g_picker_factory->CreatePicker();
|
| } else {
|
| - std::vector<scoped_ptr<DesktopMediaList>> media_lists;
|
| + std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
|
| // Create a screens/windows list and push it into media_lists.
|
| if (show_screens || show_windows) {
|
| #if defined(USE_ASH)
|
| if (chrome::IsNativeWindowInAsh(parent_window)) {
|
| - media_lists.push_back(make_scoped_ptr(new DesktopMediaListAsh(
|
| + media_lists.push_back(base::WrapUnique(new DesktopMediaListAsh(
|
| (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
|
| (show_windows ? DesktopMediaListAsh::WINDOWS : 0))));
|
| }
|
| @@ -146,18 +147,18 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
|
| webrtc::DesktopCaptureOptions options =
|
| webrtc::DesktopCaptureOptions::CreateDefault();
|
| options.set_disable_effects(false);
|
| - scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
|
| + std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
|
| show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
|
| - scoped_ptr<webrtc::WindowCapturer> window_capturer(
|
| + std::unique_ptr<webrtc::WindowCapturer> window_capturer(
|
| show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
|
|
|
| - media_lists.push_back(make_scoped_ptr(new NativeDesktopMediaList(
|
| + media_lists.push_back(base::WrapUnique(new NativeDesktopMediaList(
|
| std::move(screen_capturer), std::move(window_capturer))));
|
| }
|
| }
|
|
|
| if (show_tabs)
|
| - media_lists.push_back(make_scoped_ptr(new TabDesktopMediaList()));
|
| + media_lists.push_back(base::WrapUnique(new TabDesktopMediaList()));
|
|
|
| DCHECK(!media_lists.empty());
|
|
|
|
|