| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index 35f64bc3aa43a4e2bd44455ebe8cb7eb32900669..c077e60eb3c333dca5e9f9be44c75b1a45c10124 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -5,7 +5,7 @@
|
| #include "chrome/browser/profiles/profile_impl.h"
|
|
|
| #include <stddef.h>
|
| -
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -457,19 +457,14 @@ ProfileImpl::ProfileImpl(
|
| g_browser_process->safe_browsing_service());
|
| if (safe_browsing_service.get()) {
|
| pref_validation_delegate_ =
|
| - safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass();
|
| + safe_browsing_service->CreatePreferenceValidationDelegate(this);
|
| }
|
|
|
| {
|
| prefs_ = chrome_prefs::CreateProfilePrefs(
|
| - path_,
|
| - sequenced_task_runner,
|
| - pref_validation_delegate_.get(),
|
| - profile_policy_connector_->policy_service(),
|
| - supervised_user_settings,
|
| - CreateExtensionPrefStore(this, false),
|
| - pref_registry_,
|
| - async_prefs).Pass();
|
| + path_, sequenced_task_runner, pref_validation_delegate_.get(),
|
| + profile_policy_connector_->policy_service(), supervised_user_settings,
|
| + CreateExtensionPrefStore(this, false), pref_registry_, async_prefs);
|
| // Register on BrowserContext.
|
| user_prefs::UserPrefs::Set(this, prefs_.get());
|
| }
|
| @@ -923,10 +918,10 @@ net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors) {
|
| return io_data_.CreateMainRequestContextGetter(
|
| - protocol_handlers,
|
| - request_interceptors.Pass(),
|
| - g_browser_process->local_state(),
|
| - g_browser_process->io_thread()).get();
|
| + protocol_handlers, std::move(request_interceptors),
|
| + g_browser_process->local_state(),
|
| + g_browser_process->io_thread())
|
| + .get();
|
| }
|
|
|
| net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
|
| @@ -979,10 +974,9 @@ ProfileImpl::CreateRequestContextForStoragePartition(
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors) {
|
| return io_data_.CreateIsolatedAppRequestContextGetter(
|
| - partition_path,
|
| - in_memory,
|
| - protocol_handlers,
|
| - request_interceptors.Pass()).get();
|
| + partition_path, in_memory, protocol_handlers,
|
| + std::move(request_interceptors))
|
| + .get();
|
| }
|
|
|
| net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
|
|
|