Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3266)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2618393003: Remove ScopedVector from ContentBrowserClient. (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index a0f3bf2981887da9c26f878da086aec12709069f..85cc9a6faf406837fc2f18d60796e2989467c0ad 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2779,12 +2779,13 @@ void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
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>(
@@ -2794,7 +2795,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
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) {
@@ -3163,10 +3164,10 @@ void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
}
}
-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 =
@@ -3232,7 +3233,8 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS)
- throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
+ throttles.push_back(
+ base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle));
#endif
return throttles;
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698