Remove ScopedVector from media/base/

media/base/text_renderer_unittest.cc

Index: media/base/text_renderer_unittest.cc
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc
index f188049fae46b99e1df0f7136c027159e4d668f7..69f2d6189d4e99e8b23f692e086f61f0db40e997 100644
--- a/media/base/text_renderer_unittest.cc
+++ b/media/base/text_renderer_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"

[xhwang, 2017/05/10 17:24:48]

#include "base/memory/ptr_util.h"

[Chandan, 2017/05/11 06:04:04]

Done.

-#include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "media/base/audio_decoder_config.h"
@@ -77,13 +76,13 @@ class TextRendererTest : public testing::Test {
                     const std::string& language,
                     bool expect_read) {
     const size_t idx = text_track_streams_.size();
-    text_track_streams_.push_back(new FakeTextTrackStream);
+    text_track_streams_.push_back(base::MakeUnique<FakeTextTrackStream>());
 
     if (expect_read)
       ExpectRead(idx);
 
     const TextTrackConfig config(kind, name, language, std::string());
-    text_renderer_->AddTextStream(text_track_streams_.back(), config);
+    text_renderer_->AddTextStream(text_track_streams_.back().get(), config);
     base::RunLoop().RunUntilIdle();
 
     EXPECT_EQ(text_tracks_.size(), text_track_streams_.size());
@@ -107,7 +106,7 @@ class TextRendererTest : public testing::Test {
   }
 
   void RemoveTextTrack(unsigned idx) {
-    FakeTextTrackStream* const stream = text_track_streams_[idx];
+    FakeTextTrackStream* const stream = text_track_streams_[idx].get();
     text_renderer_->RemoveTextStream(stream);
     EXPECT_FALSE(text_tracks_[idx]);
   }
@@ -124,7 +123,7 @@ class TextRendererTest : public testing::Test {
   }
 
   void AbortPendingRead(unsigned idx) {
-    FakeTextTrackStream* const stream = text_track_streams_[idx];
+    FakeTextTrackStream* const stream = text_track_streams_[idx].get();
     stream->AbortPendingRead();
     base::RunLoop().RunUntilIdle();
   }
@@ -136,7 +135,7 @@ class TextRendererTest : public testing::Test {
   }
 
   void SendEosNotification(unsigned idx) {
-    FakeTextTrackStream* const stream = text_track_streams_[idx];
+    FakeTextTrackStream* const stream = text_track_streams_[idx].get();
     stream->SendEosNotification();
     base::RunLoop().RunUntilIdle();
   }
@@ -148,7 +147,7 @@ class TextRendererTest : public testing::Test {
   }
 
   void SendCue(unsigned idx, bool expect_cue) {
-    FakeTextTrackStream* const text_stream = text_track_streams_[idx];
+    FakeTextTrackStream* const text_stream = text_track_streams_[idx].get();
 
     const base::TimeDelta start;
     const base::TimeDelta duration = base::TimeDelta::FromSeconds(42);
@@ -196,7 +195,7 @@ class TextRendererTest : public testing::Test {
   }
 
   void ExpectRead(size_t idx) {
-    FakeTextTrackStream* const stream = text_track_streams_[idx];
+    FakeTextTrackStream* const stream = text_track_streams_[idx].get();
     EXPECT_CALL(*stream, OnRead());
   }
 
@@ -206,7 +205,7 @@ class TextRendererTest : public testing::Test {
 
   base::MessageLoop message_loop_;
 
-  typedef ScopedVector<FakeTextTrackStream> TextTrackStreams;
+  typedef std::vector<std::unique_ptr<FakeTextTrackStream>> TextTrackStreams;
   TextTrackStreams text_track_streams_;
 
   typedef std::vector<FakeTextTrack*> TextTracks;