| Index: net/url_request/url_request_context_builder.h
|
| diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
|
| index 6e8b45ac82e745f2ab29951e8a862b5f8cd3dedf..5b70b4cd149658639d0859ef29b7ea62cb2e966c 100644
|
| --- a/net/url_request/url_request_context_builder.h
|
| +++ b/net/url_request/url_request_context_builder.h
|
| @@ -15,8 +15,8 @@
|
| #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_BUILDER_H_
|
|
|
| #include <stdint.h>
|
| -
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| @@ -110,10 +110,10 @@ class NET_EXPORT URLRequestContextBuilder {
|
| // set, will be used to construct a ProxyService.
|
| void set_proxy_config_service(
|
| scoped_ptr<ProxyConfigService> proxy_config_service) {
|
| - proxy_config_service_ = proxy_config_service.Pass();
|
| + proxy_config_service_ = std::move(proxy_config_service);
|
| }
|
| void set_proxy_service(scoped_ptr<ProxyService> proxy_service) {
|
| - proxy_service_ = proxy_service.Pass();
|
| + proxy_service_ = std::move(proxy_service);
|
| }
|
|
|
| // Call these functions to specify hard-coded Accept-Language
|
| @@ -153,14 +153,14 @@ class NET_EXPORT URLRequestContextBuilder {
|
|
|
| // By default host_resolver is constructed with CreateDefaultResolver.
|
| void set_host_resolver(scoped_ptr<HostResolver> host_resolver) {
|
| - host_resolver_ = host_resolver.Pass();
|
| + host_resolver_ = std::move(host_resolver);
|
| }
|
|
|
| // Uses BasicNetworkDelegate by default. Note that calling Build will unset
|
| // any custom delegate in builder, so this must be called each time before
|
| // Build is called.
|
| void set_network_delegate(scoped_ptr<NetworkDelegate> delegate) {
|
| - network_delegate_ = delegate.Pass();
|
| + network_delegate_ = std::move(delegate);
|
| }
|
|
|
| // Sets a specific HttpAuthHandlerFactory to be used by the URLRequestContext
|
|
|