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

Unified Diff: webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc

Issue 1698843003: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/transient/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: compile fix Created 4 years, 10 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
Index: webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc b/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc
index e4e9048f8803a5559c5fe3dffade1f5a44d09881..3e202bf088c61fdf7bb64d03c722e21eb632d3c9 100644
--- a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc
+++ b/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/audio_processing/transient/wpd_tree.h"
+#include <memory>
#include <sstream>
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h"
#include "webrtc/modules/audio_processing/transient/file_utils.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
@@ -85,8 +85,8 @@ TEST(WPDTreeTest, CorrectnessBasedOnMatlabFiles) {
kDaubechies8CoefficientsLength,
kLevels);
// Allocate and open all matlab and out files.
- rtc::scoped_ptr<FileWrapper> matlab_files_data[kLeaves];
- rtc::scoped_ptr<FileWrapper> out_files_data[kLeaves];
+ std::unique_ptr<FileWrapper> matlab_files_data[kLeaves];
+ std::unique_ptr<FileWrapper> out_files_data[kLeaves];
for (int i = 0; i < kLeaves; ++i) {
// Matlab files.
@@ -123,7 +123,7 @@ TEST(WPDTreeTest, CorrectnessBasedOnMatlabFiles) {
std::string test_file_name = test::ResourcePath(
"audio_processing/transient/ajm-macbook-1-spke16m", "pcm");
- rtc::scoped_ptr<FileWrapper> test_file(FileWrapper::Create());
+ std::unique_ptr<FileWrapper> test_file(FileWrapper::Create());
test_file->OpenFile(test_file_name.c_str(),
true, // Read only.

Powered by Google App Engine
This is Rietveld 408576698