Remove ScopedVector from chrome/browser/.

chrome/browser/media_galleries/media_file_system_registry_unittest.cc

 // Copyright (c) 2012 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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <set>
+#include <vector>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_galleries/media_file_system_context.h"
@@ skipping 240 matching lines @@
   return path.BaseName().LossyDisplayName();
 #else
   return path.LossyDisplayName();
 #endif
 }
 
 }  // namespace
 
 class MediaFileSystemRegistryTest : public ChromeRenderViewHostTestHarness {
  public:
+  MediaFileSystemRegistryTest() = default;
+
+  ~MediaFileSystemRegistryTest() override = default;
+
   void CreateProfileState(size_t profile_count);
 
   ProfileState* GetProfileState(size_t i);
 
   MediaGalleriesPreferences* GetPreferences(Profile* profile);
 
   base::FilePath empty_dir() {
     return empty_dir_;
   }
 
@@ skipping 80 matching lines @@
   // Needed for extension service & friends to work.
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
   MockProfileSharedRenderProcessHostFactory rph_factory_;
 
-  ScopedVector<ProfileState> profile_states_;
+  std::vector<std::unique_ptr<ProfileState>> profile_states_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistryTest);
 };
 
 namespace {
 
 bool MediaFileSystemInfoComparator(const MediaFileSystemInfo& a,
                                    const MediaFileSystemInfo& b) {
   CHECK_NE(a.name, b.name);  // Name must be unique.
   return a.name < b.name;
 }
 
@@ skipping 203 matching lines @@
 }
 
 }  // namespace
 
 /////////////////////////////////
 // MediaFileSystemRegistryTest //
 /////////////////////////////////
 
 void MediaFileSystemRegistryTest::CreateProfileState(size_t profile_count) {
   for (size_t i = 0; i < profile_count; ++i) {
-    ProfileState* state = new ProfileState(&rph_factory_);
-    profile_states_.push_back(state);
+    profile_states_.push_back(base::MakeUnique<ProfileState>(&rph_factory_));
   }
 }
 
 ProfileState* MediaFileSystemRegistryTest::GetProfileState(size_t i) {
-  return profile_states_[i];
+  return profile_states_[i].get();
 }
 
 MediaGalleriesPreferences* MediaFileSystemRegistryTest::GetPreferences(
     Profile* profile) {
   MediaGalleriesPreferences* prefs = registry()->GetPreferences(profile);
   base::RunLoop loop;
   prefs->EnsureInitialized(loop.QuitClosure());
   loop.Run();
   return prefs;
 }
@@ skipping 456 matching lines @@
       fs_info.begin()->second.fsid).empty());
 
   // Revoke permission and ensure that the file system is revoked.
   SetGalleryPermission(profile_state,
                        profile_state->regular_permission_extension(),
                        device_id,
                        false /*has access*/);
   EXPECT_TRUE(test_file_system_context()->GetRegisteredPath(
       fs_info.begin()->second.fsid).empty());
 }