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

Unified Diff: media/formats/mp4/mp4_stream_parser_unittest.cc

Issue 1874413003: Convert media/formats 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
Index: media/formats/mp4/mp4_stream_parser_unittest.cc
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index f5681776bd4ce4e17ef77ab9dd572a36c9723849..e84a85b70c14b88b3ce2a6c8a31ca4d7ccee2621 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/formats/mp4/mp4_stream_parser.h"
+
#include <stddef.h>
#include <stdint.h>
#include <algorithm>
+#include <memory>
#include <string>
#include "base/bind.h"
@@ -25,7 +28,6 @@
#include "media/base/video_decoder_config.h"
#include "media/formats/mp4/es_descriptor.h"
#include "media/formats/mp4/fourccs.h"
-#include "media/formats/mp4/mp4_stream_parser.h"
#include "media/media_features.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -68,9 +70,9 @@ class MP4StreamParserTest : public testing::Test {
protected:
scoped_refptr<StrictMock<MockMediaLog>> media_log_;
- scoped_ptr<MP4StreamParser> parser_;
+ std::unique_ptr<MP4StreamParser> parser_;
bool configs_received_;
- scoped_ptr<MediaTracks> media_tracks_;
+ std::unique_ptr<MediaTracks> media_tracks_;
AudioDecoderConfig audio_decoder_config_;
VideoDecoderConfig video_decoder_config_;
DecodeTimestamp lower_bound_;
@@ -111,7 +113,7 @@ class MP4StreamParserTest : public testing::Test {
params.detected_text_track_count);
}
- bool NewConfigF(scoped_ptr<MediaTracks> tracks,
+ bool NewConfigF(std::unique_ptr<MediaTracks> tracks,
const StreamParser::TextTrackConfigMap& tc) {
configs_received_ = true;
CHECK(tracks.get());

Powered by Google App Engine
This is Rietveld 408576698