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

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

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 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: ios/chrome/browser/net/proxy_service_factory.cc
diff --git a/ios/chrome/browser/net/proxy_service_factory.cc b/ios/chrome/browser/net/proxy_service_factory.cc
index 32943944beafa1a2650c6d8bb2a43e69b13404bc..456d8d9c3c2e37d1821a098883975bd82f53770a 100644
--- a/ios/chrome/browser/net/proxy_service_factory.cc
+++ b/ios/chrome/browser/net/proxy_service_factory.cc
@@ -4,6 +4,8 @@
#include "ios/chrome/browser/net/proxy_service_factory.h"
+#include <utility>
+
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
#include "ios/web/public/web_thread.h"
#include "net/proxy/proxy_config_service.h"
@@ -18,7 +20,7 @@ ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
net::ProxyService::CreateSystemProxyConfigService(
web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE)));
- return tracker->CreateTrackingProxyConfigService(base_service.Pass()).Pass();
+ return tracker->CreateTrackingProxyConfigService(std::move(base_service));
}
// static
@@ -50,9 +52,9 @@ scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);
scoped_ptr<net::ProxyService> proxy_service(
net::ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service.Pass(), 0, net_log));
+ std::move(proxy_config_service), 0, net_log));
proxy_service->set_quick_check_enabled(quick_check_enabled);
- return proxy_service.Pass();
+ return proxy_service;
}
} // namespace ios
« no previous file with comments | « ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc ('k') | ios/chrome/browser/passwords/credential_manager.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698