Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Unified Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl_unittest.cc
diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc
index 2e53526c12396b3c6ad44bb5974506ded1752a5e..51934a1c7ce188751cbfce80e81e72ca3da715a0 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -2,12 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/blink/webmediaplayer_impl.h"
+
#include <stdint.h>
+#include <memory>
+
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
@@ -17,7 +21,6 @@
#include "media/base/test_helpers.h"
#include "media/blink/mock_webframeclient.h"
#include "media/blink/webmediaplayer_delegate.h"
-#include "media/blink/webmediaplayer_impl.h"
#include "media/blink/webmediaplayer_params.h"
#include "media/renderers/default_renderer_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -96,7 +99,7 @@ class WebMediaPlayerImplTest : public testing::Test {
wmpi_.reset(new WebMediaPlayerImpl(
web_local_frame_, &client_, nullptr,
base::WeakPtr<WebMediaPlayerDelegate>(),
- make_scoped_ptr(new DefaultRendererFactory(
+ base::WrapUnique(new DefaultRendererFactory(
media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(),
audio_hardware_config_)),
url_index_,
@@ -186,7 +189,7 @@ class WebMediaPlayerImplTest : public testing::Test {
DummyWebMediaPlayerClient client_;
// The WebMediaPlayerImpl instance under test.
- scoped_ptr<WebMediaPlayerImpl> wmpi_;
+ std::unique_ptr<WebMediaPlayerImpl> wmpi_;
private:
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImplTest);
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698