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

Unified Diff: media/base/multi_channel_resampler_unittest.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/multi_channel_resampler.h ('k') | media/base/null_video_sink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/multi_channel_resampler_unittest.cc
diff --git a/media/base/multi_channel_resampler_unittest.cc b/media/base/multi_channel_resampler_unittest.cc
index 2f77785db4b8e7f0ad0e1b6155bac196552718be..9b355158187f37f5b35e36582986246f49b339b0 100644
--- a/media/base/multi_channel_resampler_unittest.cc
+++ b/media/base/multi_channel_resampler_unittest.cc
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/base/multi_channel_resampler.h"
+
#include <cmath>
+#include <memory>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/audio_bus.h"
-#include "media/base/multi_channel_resampler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
@@ -118,7 +119,7 @@ class MultiChannelResamplerTest
protected:
int frames_;
bool fill_junk_values_;
- scoped_ptr<AudioBus> audio_bus_;
+ std::unique_ptr<AudioBus> audio_bus_;
int last_frame_delay_;
DISALLOW_COPY_AND_ASSIGN(MultiChannelResamplerTest);
« no previous file with comments | « media/base/multi_channel_resampler.h ('k') | media/base/null_video_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698