Remove ScopedVector from ContentBrowserClient.

chrome/browser/platform_util_unittest.cc

 // Copyright 2015 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 "chrome/browser/platform_util.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/platform_util_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/json/json_string_value_serializer.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/mock_special_storage_policy.h"
@@ skipping 12 matching lines @@
 #if defined(OS_CHROMEOS)
 
 // ChromeContentBrowserClient subclass that sets up a custom file system backend
 // that allows the test to grant file access to the file manager extension ID
 // without having to install the extension.
 class PlatformUtilTestContentBrowserClient : public ChromeContentBrowserClient {
  public:
   void GetAdditionalFileSystemBackends(
       content::BrowserContext* browser_context,
       const base::FilePath& storage_partition_path,
-      ScopedVector<storage::FileSystemBackend>* additional_backends) override {
+      std::vector<std::unique_ptr<storage::FileSystemBackend>>*
+          additional_backends) override {
     storage::ExternalMountPoints* external_mount_points =
         content::BrowserContext::GetMountPoints(browser_context);
 
     // New FileSystemBackend that uses our MockSpecialStoragePolicy.
-    chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
-        nullptr, nullptr, nullptr, nullptr, nullptr, external_mount_points,
-        storage::ExternalMountPoints::GetSystemInstance());
-    additional_backends->push_back(backend);
+    additional_backends->push_back(
+        base::MakeUnique<chromeos::FileSystemBackend>(
+            nullptr, nullptr, nullptr, nullptr, nullptr, external_mount_points,
+            storage::ExternalMountPoints::GetSystemInstance()));
   }
 };
 
 // Base test fixture class to be used on Chrome OS.
 class PlatformUtilTestBase : public BrowserWithTestWindowTest {
  protected:
   void SetUpPlatformFixture(const base::FilePath& test_directory) {
     content_browser_client_.reset(new PlatformUtilTestContentBrowserClient());
     old_content_browser_client_ =
         content::SetBrowserClientForTesting(content_browser_client_.get());
@@ skipping 215 matching lines @@
 TEST_F(PlatformUtilPosixTest, OpenFolderWithPosixSymlinks) {
   EXPECT_EQ(OPEN_SUCCEEDED, CallOpenItem(symlink_to_folder_, OPEN_FOLDER));
   EXPECT_EQ(OPEN_FAILED_INVALID_TYPE,
             CallOpenItem(symlink_to_file_, OPEN_FOLDER));
   EXPECT_EQ(OPEN_FAILED_PATH_NOT_FOUND,
             CallOpenItem(symlink_to_nowhere_, OPEN_FOLDER));
 }
 #endif  // OS_POSIX && !OS_CHROMEOS
 
 }  // namespace platform_util