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

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 20bab5c9f39b773eb2f160fa875e9d8bd5e56605..6192bac46bf8d3943c5ab43cf01354345c278fdd 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/net/proxy_service_factory.h"
#include <stddef.h>
-
#include <string>
+#include <utility>
#include "base/command_line.h"
#include "base/metrics/field_trial.h"
@@ -86,7 +86,7 @@ ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
#endif // !defined(OS_CHROMEOS)
- return tracker->CreateTrackingProxyConfigService(base_service.Pass());
+ return tracker->CreateTrackingProxyConfigService(std::move(base_service));
}
// static
@@ -173,28 +173,31 @@ scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
// should override other options.
if (command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
proxy_service = net::CreateProxyServiceUsingMojoInProcess(
- proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
- dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
- network_delegate);
+ std::move(proxy_config_service),
+ new net::ProxyScriptFetcherImpl(context),
+ std::move(dhcp_proxy_script_fetcher), context->host_resolver(),
+ net_log, network_delegate);
} else if (EnableOutOfProcessV8Pac(command_line)) {
proxy_service = net::CreateProxyServiceUsingMojoFactory(
UtilityProcessMojoProxyResolverFactory::GetInstance(),
- proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
- dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
- network_delegate);
+ std::move(proxy_config_service),
+ new net::ProxyScriptFetcherImpl(context),
+ std::move(dhcp_proxy_script_fetcher), context->host_resolver(),
+ net_log, network_delegate);
}
#endif // !defined(OS_ANDROID)
if (!proxy_service) {
proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
- proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
- dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
- network_delegate);
+ std::move(proxy_config_service),
+ new net::ProxyScriptFetcherImpl(context),
+ std::move(dhcp_proxy_script_fetcher), context->host_resolver(),
+ net_log, network_delegate);
}
#endif // defined(OS_IOS)
} else {
proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service.Pass(), num_pac_threads, net_log);
+ std::move(proxy_config_service), num_pac_threads, net_log);
}
proxy_service->set_quick_check_enabled(quick_check_enabled);

Powered by Google App Engine
This is Rietveld 408576698