Remove ScopedVector from ContentBrowserClient.

chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_file_system_backend.h"
 #include "content/public/test/test_file_system_context.h"
 #include "content/public/test/test_utils.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
@@ skipping 80 matching lines @@
  private:
   // Create the test files, filesystem objects, etc.
   void SetupOnFileThread(const std::string& filename,
                          const std::string& content,
                          bool expected_result) {
     ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
     base::FilePath base = base_dir_.GetPath();
     base::FilePath src_path = base.AppendASCII("src_fs");
     ASSERT_TRUE(base::CreateDirectory(src_path));
 
-    ScopedVector<storage::FileSystemBackend> additional_providers;
-    additional_providers.push_back(new content::TestFileSystemBackend(
-        base::ThreadTaskRunnerHandle::Get().get(), src_path));
-    additional_providers.push_back(new MediaFileSystemBackend(
+    std::vector<std::unique_ptr<storage::FileSystemBackend>>
+        additional_providers;
+    additional_providers.push_back(
+        base::MakeUnique<content::TestFileSystemBackend>(
+            base::ThreadTaskRunnerHandle::Get().get(), src_path));
+    additional_providers.push_back(base::MakeUnique<MediaFileSystemBackend>(
         base, base::ThreadTaskRunnerHandle::Get().get()));
     file_system_context_ =
         content::CreateFileSystemContextWithAdditionalProvidersForTesting(
             NULL, std::move(additional_providers), base);
 
     move_src_ = file_system_context_->CreateCrackedFileSystemURL(
         GURL(kOrigin),
         storage::kFileSystemTypeTest,
         base::FilePath::FromUTF8Unsafe(filename));
 
@@ skipping 152 matching lines @@
   test_file = test_file.AppendASCII("no_streams.webm");
   MoveTestFromFile("no_streams.webm", test_file, false);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaFileValidatorTest, ValidVideo) {
   base::FilePath test_file = GetMediaTestDir();
   ASSERT_FALSE(test_file.empty());
   test_file = test_file.AppendASCII("bear-320x240-multitrack.webm");
   MoveTestFromFile("multitrack.webm", test_file, true);
 }