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

Unified Diff: media/base/mock_filters.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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/base/mock_filters.h ('k') | media/base/mock_media_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.cc
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 1c783bd55f0319e71b512b83813a27e8bfc1bbd1..409c2fb2028e3524156844ffaa54656915b06a6d 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -5,7 +5,6 @@
#include "media/base/mock_filters.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
using ::testing::_;
using ::testing::Invoke;
@@ -19,7 +18,7 @@ MockPipeline::MockPipeline() {}
MockPipeline::~MockPipeline() {}
void MockPipeline::Start(Demuxer* demuxer,
- scoped_ptr<Renderer> renderer,
+ std::unique_ptr<Renderer> renderer,
const base::Closure& ended_cb,
const PipelineStatusCB& error_cb,
const PipelineStatusCB& seek_cb,
@@ -33,7 +32,7 @@ void MockPipeline::Start(Demuxer* demuxer,
waiting_for_decryption_key_cb);
}
-void MockPipeline::Resume(scoped_ptr<Renderer> renderer,
+void MockPipeline::Resume(std::unique_ptr<Renderer> renderer,
base::TimeDelta timestamp,
const PipelineStatusCB& seek_cb) {
Resume(&renderer, timestamp, seek_cb);
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/mock_media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698