Remove ScopedVector from ContentBrowserClient.

chrome/browser/chrome_content_browser_client.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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2761 matching lines @@
     extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
 }
 
 ::rappor::RapporService* ChromeContentBrowserClient::GetRapporService() {
   return g_browser_process->rappor_service();
 }
 
 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
     content::BrowserContext* browser_context,
     const base::FilePath& storage_partition_path,
-    ScopedVector<storage::FileSystemBackend>* additional_backends) {
+    std::vector<std::unique_ptr<storage::FileSystemBackend>>*
+        additional_backends) {
 #if defined(OS_CHROMEOS)
   storage::ExternalMountPoints* external_mount_points =
       content::BrowserContext::GetMountPoints(browser_context);
   DCHECK(external_mount_points);
-  chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
+  auto backend = base::MakeUnique<chromeos::FileSystemBackend>(
       base::MakeUnique<drive::FileSystemBackendDelegate>(),
       base::MakeUnique<chromeos::file_system_provider::BackendDelegate>(),
       base::MakeUnique<chromeos::MTPFileSystemBackendDelegate>(
           storage_partition_path),
       base::MakeUnique<arc::ArcContentFileSystemBackendDelegate>(),
       base::MakeUnique<arc::ArcDocumentsProviderBackendDelegate>(),
       external_mount_points, storage::ExternalMountPoints::GetSystemInstance());
   backend->AddSystemMountPoints();
   DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal));
-  additional_backends->push_back(backend);
+  additional_backends->push_back(std::move(backend));
 #endif
 
   for (size_t i = 0; i < extra_parts_.size(); ++i) {
     extra_parts_[i]->GetAdditionalFileSystemBackends(
         browser_context, storage_partition_path, additional_backends);
   }
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
@@ skipping 348 matching lines @@
 }
 
 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
                                                  const GURL& url) {
   if (url.is_valid()) {
     rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                             metric, url);
   }
 }
 
-ScopedVector<content::NavigationThrottle>
+std::vector<std::unique_ptr<content::NavigationThrottle>>
 ChromeContentBrowserClient::CreateThrottlesForNavigation(
     content::NavigationHandle* handle) {
-  ScopedVector<content::NavigationThrottle> throttles;
+  std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
 
 #if BUILDFLAG(ENABLE_PLUGINS)
   std::unique_ptr<content::NavigationThrottle> flash_url_throttle =
       FlashDownloadInterception::MaybeCreateThrottleFor(handle);
   if (flash_url_throttle)
     throttles.push_back(std::move(flash_url_throttle));
 #endif
 
   if (handle->IsInMainFrame()) {
     throttles.push_back(
@@ skipping 45 matching lines @@
         auto intent_picker_cb = base::Bind(ShowIntentPickerBubble());
         auto url_to_arc_throttle = base::MakeUnique<arc::ArcNavigationThrottle>(
             handle, intent_picker_cb);
         throttles.push_back(std::move(url_to_arc_throttle));
       }
     }
   }
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
+  throttles.push_back(
+      base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle));
 #endif
 
   return throttles;
 }
 
 std::unique_ptr<content::NavigationUIData>
 ChromeContentBrowserClient::GetNavigationUIData(
     content::NavigationHandle* navigation_handle) {
   return base::MakeUnique<ChromeNavigationUIData>(navigation_handle);
 }
@@ skipping 122 matching lines @@
 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
 }
 
 bool ChromeContentBrowserClient::
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }