Convert Pass()→std::move() in //net
BUG=557422
[email protected]
[email protected]
Review URL: https://codereview.chromium.org/1545233002
Cr-Commit-Position: refs/heads/master@{#366889}
diff --git a/net/url_request/certificate_report_sender.cc b/net/url_request/certificate_report_sender.cc
index 0ff637b..55b27a59 100644
--- a/net/url_request/certificate_report_sender.cc
+++ b/net/url_request/certificate_report_sender.cc
@@ -4,6 +4,8 @@
#include "net/url_request/certificate_report_sender.h"
+#include <utility>
+
#include "base/stl_util.h"
#include "net/base/elements_upload_data_stream.h"
#include "net/base/load_flags.h"
@@ -42,7 +44,7 @@
scoped_ptr<UploadElementReader> reader(
UploadOwnedBytesElementReader::CreateWithString(report));
url_request->set_upload(
- ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
+ ElementsUploadDataStream::CreateWithReader(std::move(reader), 0));
URLRequest* raw_url_request = url_request.get();
inflight_requests_.insert(url_request.release());
diff --git a/net/url_request/sdch_dictionary_fetcher_unittest.cc b/net/url_request/sdch_dictionary_fetcher_unittest.cc
index 6acad54..e676a25 100644
--- a/net/url_request/sdch_dictionary_fetcher_unittest.cc
+++ b/net/url_request/sdch_dictionary_fetcher_unittest.cc
@@ -5,6 +5,7 @@
#include "net/url_request/sdch_dictionary_fetcher.h"
#include <string>
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -124,8 +125,8 @@
new SpecifiedResponseJobInterceptor(http_response_info,
lifecycle_callback));
- URLRequestFilter::GetInstance()->AddHostnameInterceptor("http", kTestDomain,
- interceptor.Pass());
+ URLRequestFilter::GetInstance()->AddHostnameInterceptor(
+ "http", kTestDomain, std::move(interceptor));
}
static void Unregister() {
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index fb90566..805ef646 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -5,6 +5,7 @@
#include "net/url_request/test_url_fetcher_factory.h"
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/compiler_specific.h"
@@ -179,7 +180,7 @@
// to be done in SaveResponseToFileAtPath(), and this method supports only
// URLFetcherStringWriter (for testing of this method only).
if (fake_response_destination_ == STRING) {
- response_writer_ = response_writer.Pass();
+ response_writer_ = std::move(response_writer);
int response = response_writer_->Initialize(CompletionCallback());
// The TestURLFetcher doesn't handle asynchronous writes.
DCHECK_EQ(OK, response);
diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc
index 7a2c5e32..5fe0dbd 100644
--- a/net/url_request/url_fetcher_core.cc
+++ b/net/url_request/url_fetcher_core.cc
@@ -5,6 +5,7 @@
#include "net/url_request/url_fetcher_core.h"
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/logging.h"
@@ -301,7 +302,7 @@
void URLFetcherCore::SaveResponseWithWriter(
scoped_ptr<URLFetcherResponseWriter> response_writer) {
DCHECK(delegate_task_runner_->BelongsToCurrentThread());
- response_writer_ = response_writer.Pass();
+ response_writer_ = std::move(response_writer);
}
HttpResponseHeaders* URLFetcherCore::GetResponseHeaders() const {
@@ -583,7 +584,7 @@
scoped_ptr<UploadElementReader> reader(new UploadBytesElementReader(
upload_content_.data(), upload_content_.size()));
request_->set_upload(
- ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
+ ElementsUploadDataStream::CreateWithReader(std::move(reader), 0));
} else if (!upload_file_path_.empty()) {
scoped_ptr<UploadElementReader> reader(
new UploadFileElementReader(upload_file_task_runner_.get(),
@@ -592,11 +593,11 @@
upload_range_length_,
base::Time()));
request_->set_upload(
- ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
+ ElementsUploadDataStream::CreateWithReader(std::move(reader), 0));
} else if (!upload_stream_factory_.is_null()) {
scoped_ptr<UploadDataStream> stream = upload_stream_factory_.Run();
DCHECK(stream);
- request_->set_upload(stream.Pass());
+ request_->set_upload(std::move(stream));
}
current_upload_bytes_ = -1;
diff --git a/net/url_request/url_fetcher_impl.cc b/net/url_request/url_fetcher_impl.cc
index 02a3ae9..ed00e4ef 100644
--- a/net/url_request/url_fetcher_impl.cc
+++ b/net/url_request/url_fetcher_impl.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_fetcher_impl.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/sequenced_task_runner.h"
#include "net/base/upload_data_stream.h"
@@ -139,7 +141,7 @@
void URLFetcherImpl::SaveResponseWithWriter(
scoped_ptr<URLFetcherResponseWriter> response_writer) {
- core_->SaveResponseWithWriter(response_writer.Pass());
+ core_->SaveResponseWithWriter(std::move(response_writer));
}
HttpResponseHeaders* URLFetcherImpl::GetResponseHeaders() const {
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index ef5a413..4d1a871d 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
@@ -208,7 +210,7 @@
}
void URLRequest::set_upload(scoped_ptr<UploadDataStream> upload) {
- upload_data_stream_ = upload.Pass();
+ upload_data_stream_ = std::move(upload);
}
const UploadDataStream* URLRequest::get_upload() const {
@@ -287,7 +289,7 @@
for (const GURL& url : url_chain_) {
list->AppendString(url.possibly_invalid_spec());
}
- dict->Set("url_chain", list.Pass());
+ dict->Set("url_chain", std::move(list));
}
dict->SetInteger("load_flags", load_flags_);
@@ -322,7 +324,7 @@
}
if (status_.error() != OK)
dict->SetInteger("net_error", status_.error());
- return dict.Pass();
+ return std::move(dict);
}
void URLRequest::LogBlockedBy(const char* blocked_by) {
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 734292b..8290c5d 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -5,6 +5,7 @@
#include "net/url_request/url_request_context_builder.h"
#include <string>
+#include <utility>
#include <vector>
#include "base/compiler_specific.h"
@@ -152,7 +153,7 @@
void set_transport_security_persister(
scoped_ptr<TransportSecurityPersister> transport_security_persister) {
- transport_security_persister_ = transport_security_persister.Pass();
+ transport_security_persister_ = std::move(transport_security_persister);
}
private:
@@ -242,7 +243,7 @@
void URLRequestContextBuilder::SetCertVerifier(
scoped_ptr<CertVerifier> cert_verifier) {
- cert_verifier_ = cert_verifier.Pass();
+ cert_verifier_ = std::move(cert_verifier);
}
void URLRequestContextBuilder::SetInterceptors(
@@ -255,7 +256,7 @@
scoped_ptr<ChannelIDService> channel_id_service) {
DCHECK(cookie_store);
cookie_store_ = cookie_store;
- channel_id_service_ = channel_id_service.Pass();
+ channel_id_service_ = std::move(channel_id_service);
}
void URLRequestContextBuilder::SetFileTaskRunner(
@@ -265,12 +266,12 @@
void URLRequestContextBuilder::SetHttpAuthHandlerFactory(
scoped_ptr<HttpAuthHandlerFactory> factory) {
- http_auth_handler_factory_ = factory.Pass();
+ http_auth_handler_factory_ = std::move(factory);
}
void URLRequestContextBuilder::SetHttpServerProperties(
scoped_ptr<HttpServerProperties> http_server_properties) {
- http_server_properties_ = http_server_properties.Pass();
+ http_server_properties_ = std::move(http_server_properties);
}
scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
@@ -283,7 +284,7 @@
if (!network_delegate_)
network_delegate_.reset(new BasicNetworkDelegate);
- storage->set_network_delegate(network_delegate_.Pass());
+ storage->set_network_delegate(std::move(network_delegate_));
if (net_log_) {
// Unlike the other builder parameters, |net_log_| is not owned by the
@@ -296,7 +297,7 @@
if (!host_resolver_) {
host_resolver_ = HostResolver::CreateDefaultResolver(context->net_log());
}
- storage->set_host_resolver(host_resolver_.Pass());
+ storage->set_host_resolver(std::move(host_resolver_));
if (!proxy_service_) {
// TODO(willchan): Switch to using this code when
@@ -309,11 +310,11 @@
}
#endif // !defined(OS_LINUX) && !defined(OS_ANDROID)
proxy_service_ = ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service_.Pass(),
+ std::move(proxy_config_service_),
0, // This results in using the default value.
context->net_log());
}
- storage->set_proxy_service(proxy_service_.Pass());
+ storage->set_proxy_service(std::move(proxy_service_));
storage->set_ssl_config_service(new SSLConfigServiceDefaults);
@@ -322,11 +323,11 @@
HttpAuthHandlerRegistryFactory::CreateDefault(context->host_resolver());
}
- storage->set_http_auth_handler_factory(http_auth_handler_factory_.Pass());
+ storage->set_http_auth_handler_factory(std::move(http_auth_handler_factory_));
if (cookie_store_) {
storage->set_cookie_store(cookie_store_.get());
- storage->set_channel_id_service(channel_id_service_.Pass());
+ storage->set_channel_id_service(std::move(channel_id_service_));
} else {
storage->set_cookie_store(new CookieMonster(NULL, NULL));
// TODO(mmenke): This always creates a file thread, even when it ends up
@@ -336,8 +337,7 @@
}
if (sdch_enabled_) {
- storage->set_sdch_manager(
- scoped_ptr<net::SdchManager>(new SdchManager()).Pass());
+ storage->set_sdch_manager(scoped_ptr<net::SdchManager>(new SdchManager()));
}
storage->set_transport_security_state(
@@ -352,14 +352,14 @@
}
if (http_server_properties_) {
- storage->set_http_server_properties(http_server_properties_.Pass());
+ storage->set_http_server_properties(std::move(http_server_properties_));
} else {
storage->set_http_server_properties(
scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
}
if (cert_verifier_) {
- storage->set_cert_verifier(cert_verifier_.Pass());
+ storage->set_cert_verifier(std::move(cert_verifier_));
} else {
storage->set_cert_verifier(CertVerifier::CreateDefault());
}
@@ -424,12 +424,12 @@
}
http_transaction_factory.reset(new HttpCache(
- storage->http_network_session(), http_cache_backend.Pass(), true));
+ storage->http_network_session(), std::move(http_cache_backend), true));
} else {
http_transaction_factory.reset(
new HttpNetworkLayer(storage->http_network_session()));
}
- storage->set_http_transaction_factory(http_transaction_factory.Pass());
+ storage->set_http_transaction_factory(std::move(http_transaction_factory));
URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl;
if (data_enabled_)
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index 6e8b45a..5b70b4c 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 @@
// 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 @@
// 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
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index e4294b2..399bc47 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request_context_storage.h"
+#include <utility>
+
#include "base/logging.h"
#include "net/base/network_delegate.h"
#include "net/base/sdch_manager.h"
@@ -34,37 +36,37 @@
void URLRequestContextStorage::set_net_log(scoped_ptr<NetLog> net_log) {
context_->set_net_log(net_log.get());
- net_log_ = net_log.Pass();
+ net_log_ = std::move(net_log);
}
void URLRequestContextStorage::set_host_resolver(
scoped_ptr<HostResolver> host_resolver) {
context_->set_host_resolver(host_resolver.get());
- host_resolver_ = host_resolver.Pass();
+ host_resolver_ = std::move(host_resolver);
}
void URLRequestContextStorage::set_cert_verifier(
scoped_ptr<CertVerifier> cert_verifier) {
context_->set_cert_verifier(cert_verifier.get());
- cert_verifier_ = cert_verifier.Pass();
+ cert_verifier_ = std::move(cert_verifier);
}
void URLRequestContextStorage::set_channel_id_service(
scoped_ptr<ChannelIDService> channel_id_service) {
context_->set_channel_id_service(channel_id_service.get());
- channel_id_service_ = channel_id_service.Pass();
+ channel_id_service_ = std::move(channel_id_service);
}
void URLRequestContextStorage::set_http_auth_handler_factory(
scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory) {
context_->set_http_auth_handler_factory(http_auth_handler_factory.get());
- http_auth_handler_factory_ = http_auth_handler_factory.Pass();
+ http_auth_handler_factory_ = std::move(http_auth_handler_factory);
}
void URLRequestContextStorage::set_proxy_service(
scoped_ptr<ProxyService> proxy_service) {
context_->set_proxy_service(proxy_service.get());
- proxy_service_ = proxy_service.Pass();
+ proxy_service_ = std::move(proxy_service);
}
void URLRequestContextStorage::set_ssl_config_service(
@@ -76,12 +78,12 @@
void URLRequestContextStorage::set_network_delegate(
scoped_ptr<NetworkDelegate> network_delegate) {
context_->set_network_delegate(network_delegate.get());
- network_delegate_ = network_delegate.Pass();
+ network_delegate_ = std::move(network_delegate);
}
void URLRequestContextStorage::set_http_server_properties(
scoped_ptr<HttpServerProperties> http_server_properties) {
- http_server_properties_ = http_server_properties.Pass();
+ http_server_properties_ = std::move(http_server_properties);
context_->set_http_server_properties(http_server_properties_->GetWeakPtr());
}
@@ -93,48 +95,48 @@
void URLRequestContextStorage::set_transport_security_state(
scoped_ptr<TransportSecurityState> transport_security_state) {
context_->set_transport_security_state(transport_security_state.get());
- transport_security_state_ = transport_security_state.Pass();
+ transport_security_state_ = std::move(transport_security_state);
}
void URLRequestContextStorage::set_http_network_session(
scoped_ptr<HttpNetworkSession> http_network_session) {
- http_network_session_ = http_network_session.Pass();
+ http_network_session_ = std::move(http_network_session);
}
void URLRequestContextStorage::set_http_transaction_factory(
scoped_ptr<HttpTransactionFactory> http_transaction_factory) {
context_->set_http_transaction_factory(http_transaction_factory.get());
- http_transaction_factory_ = http_transaction_factory.Pass();
+ http_transaction_factory_ = std::move(http_transaction_factory);
}
void URLRequestContextStorage::set_job_factory(
scoped_ptr<URLRequestJobFactory> job_factory) {
context_->set_job_factory(job_factory.get());
- job_factory_ = job_factory.Pass();
+ job_factory_ = std::move(job_factory);
}
void URLRequestContextStorage::set_throttler_manager(
scoped_ptr<URLRequestThrottlerManager> throttler_manager) {
context_->set_throttler_manager(throttler_manager.get());
- throttler_manager_ = throttler_manager.Pass();
+ throttler_manager_ = std::move(throttler_manager);
}
void URLRequestContextStorage::set_backoff_manager(
scoped_ptr<URLRequestBackoffManager> backoff_manager) {
context_->set_backoff_manager(backoff_manager.get());
- backoff_manager_ = backoff_manager.Pass();
+ backoff_manager_ = std::move(backoff_manager);
}
void URLRequestContextStorage::set_http_user_agent_settings(
scoped_ptr<HttpUserAgentSettings> http_user_agent_settings) {
context_->set_http_user_agent_settings(http_user_agent_settings.get());
- http_user_agent_settings_ = http_user_agent_settings.Pass();
+ http_user_agent_settings_ = std::move(http_user_agent_settings);
}
void URLRequestContextStorage::set_sdch_manager(
scoped_ptr<SdchManager> sdch_manager) {
context_->set_sdch_manager(sdch_manager.get());
- sdch_manager_ = sdch_manager.Pass();
+ sdch_manager_ = std::move(sdch_manager);
}
} // namespace net
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc
index ab1a7d9..cb31ecf 100644
--- a/net/url_request/url_request_ftp_job_unittest.cc
+++ b/net/url_request/url_request_ftp_job_unittest.cc
@@ -4,6 +4,7 @@
#include "net/url_request/url_request_ftp_job.h"
+#include <utility>
#include <vector>
#include "base/memory/ref_counted.h"
@@ -46,7 +47,7 @@
scoped_ptr<MockAsyncProxyResolver> owned_resolver(
new MockAsyncProxyResolver());
resolver_ = owned_resolver.get();
- *resolver = owned_resolver.Pass();
+ *resolver = std::move(owned_resolver);
return OK;
}
@@ -67,13 +68,13 @@
: TestURLRequestContext(true),
ftp_protocol_handler_(new FtpProtocolHandler(ftp_transaction_factory)) {
set_client_socket_factory(socket_factory);
- context_storage_.set_proxy_service(proxy_service.Pass());
+ context_storage_.set_proxy_service(std::move(proxy_service));
set_network_delegate(network_delegate);
scoped_ptr<URLRequestJobFactoryImpl> job_factory =
make_scoped_ptr(new URLRequestJobFactoryImpl);
job_factory->SetProtocolHandler("ftp",
make_scoped_ptr(ftp_protocol_handler_));
- context_storage_.set_job_factory(job_factory.Pass());
+ context_storage_.set_job_factory(std::move(job_factory));
Init();
}
@@ -82,7 +83,7 @@
}
void set_proxy_service(scoped_ptr<ProxyService> proxy_service) {
- context_storage_.set_proxy_service(proxy_service.Pass());
+ context_storage_.set_proxy_service(std::move(proxy_service));
}
private:
@@ -321,7 +322,7 @@
request_context()->set_proxy_service(make_scoped_ptr(new ProxyService(
make_scoped_ptr(new ProxyConfigServiceFixed(
ProxyConfig::CreateFromCustomPacURL(GURL("http://foo")))),
- owned_resolver_factory.Pass(), nullptr)));
+ std::move(owned_resolver_factory), nullptr)));
TestDelegate request_delegate;
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest(
@@ -352,7 +353,7 @@
request_context()->set_proxy_service(make_scoped_ptr(new ProxyService(
make_scoped_ptr(new ProxyConfigServiceFixed(
ProxyConfig::CreateFromCustomPacURL(GURL("http://foo")))),
- owned_resolver_factory.Pass(), nullptr)));
+ std::move(owned_resolver_factory), nullptr)));
TestDelegate request_delegate;
scoped_ptr<URLRequest> url_request(request_context()->CreateRequest(
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc
index d7a7c83f..1714af9f 100644
--- a/net/url_request/url_request_http_job_unittest.cc
+++ b/net/url_request/url_request_http_job_unittest.cc
@@ -87,7 +87,7 @@
}
void EnableSdch() {
- context_.SetSdchManager(scoped_ptr<SdchManager>(new SdchManager).Pass());
+ context_.SetSdchManager(scoped_ptr<SdchManager>(new SdchManager));
}
MockNetworkLayer network_layer_;
@@ -132,10 +132,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
ASSERT_TRUE(request->is_pending());
@@ -163,10 +161,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
ASSERT_TRUE(request->is_pending());
@@ -196,10 +192,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
ASSERT_TRUE(request->is_pending());
@@ -230,10 +224,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
delegate.set_cancel_in_received_data(true);
request->Start();
@@ -280,10 +272,8 @@
socket_factory_.AddSocketDataProvider(&final_socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.redirect.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.redirect.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
ASSERT_TRUE(request->is_pending());
@@ -314,10 +304,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
delegate.set_cancel_in_response_started(true);
request->Start();
@@ -341,10 +329,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
request->Cancel();
@@ -376,9 +362,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate1;
- scoped_ptr<URLRequest> request1 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate1).Pass();
+ scoped_ptr<URLRequest> request1 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate1);
request1->Start();
ASSERT_TRUE(request1->is_pending());
@@ -391,9 +376,8 @@
// Issue another request, and backoff logic should apply.
TestDelegate delegate2;
- scoped_ptr<URLRequest> request2 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate2).Pass();
+ scoped_ptr<URLRequest> request2 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate2);
request2->Start();
ASSERT_TRUE(request2->is_pending());
@@ -441,10 +425,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate1;
- scoped_ptr<URLRequest> request1 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate1)
- .Pass();
+ scoped_ptr<URLRequest> request1 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate1);
request1->Start();
ASSERT_TRUE(request1->is_pending());
@@ -457,10 +439,8 @@
// Issue a user-initiated request, backoff logic should not apply.
TestDelegate delegate2;
- scoped_ptr<URLRequest> request2 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate2)
- .Pass();
+ scoped_ptr<URLRequest> request2 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate2);
request2->SetLoadFlags(request2->load_flags() | LOAD_MAYBE_USER_GESTURE);
request2->Start();
@@ -487,9 +467,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate).Pass();
+ scoped_ptr<URLRequest> request = context_->CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
ASSERT_TRUE(request->is_pending());
@@ -522,9 +501,8 @@
socket_factory_.AddSocketDataProvider(&socket_data);
TestDelegate delegate1;
- scoped_ptr<URLRequest> request1 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate1).Pass();
+ scoped_ptr<URLRequest> request1 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate1);
request1->Start();
ASSERT_TRUE(request1->is_pending());
@@ -538,9 +516,8 @@
// Backoff logic does not apply to a second request, since it is fetched
// from cache.
TestDelegate delegate2;
- scoped_ptr<URLRequest> request2 =
- context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY,
- &delegate2).Pass();
+ scoped_ptr<URLRequest> request2 = context_->CreateRequest(
+ GURL("https://www.example.com"), DEFAULT_PRIORITY, &delegate2);
request2->Start();
ASSERT_TRUE(request2->is_pending());
@@ -554,10 +531,8 @@
context_.set_cookie_store(new DelayedCookieMonster());
TestDelegate delegate;
- scoped_ptr<URLRequest> request =
- context_.CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
- &delegate)
- .Pass();
+ scoped_ptr<URLRequest> request = context_.CreateRequest(
+ GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate);
request->Start();
request->Cancel();
diff --git a/net/url_request/url_request_intercepting_job_factory.cc b/net/url_request/url_request_intercepting_job_factory.cc
index ea2d1f2..3ced003 100644
--- a/net/url_request/url_request_intercepting_job_factory.cc
+++ b/net/url_request/url_request_intercepting_job_factory.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request_intercepting_job_factory.h"
+#include <utility>
+
#include "base/logging.h"
#include "net/url_request/url_request_interceptor.h"
@@ -12,9 +14,8 @@
URLRequestInterceptingJobFactory::URLRequestInterceptingJobFactory(
scoped_ptr<URLRequestJobFactory> job_factory,
scoped_ptr<URLRequestInterceptor> interceptor)
- : job_factory_(job_factory.Pass()),
- interceptor_(interceptor.Pass()) {
-}
+ : job_factory_(std::move(job_factory)),
+ interceptor_(std::move(interceptor)) {}
URLRequestInterceptingJobFactory::~URLRequestInterceptingJobFactory() {}
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 2a90ce0..55a4f51e 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request_job.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/location.h"
@@ -37,7 +39,7 @@
NetLogCaptureMode /* capture_mode */) {
scoped_ptr<base::DictionaryValue> event_params(new base::DictionaryValue());
event_params->SetString("filters", filter->OrderedFilterList());
- return event_params.Pass();
+ return std::move(event_params);
}
std::string ComputeMethodForRedirect(const std::string& method,
diff --git a/net/url_request/url_request_netlog_params.cc b/net/url_request/url_request_netlog_params.cc
index 14fb453..f238b87e 100644
--- a/net/url_request/url_request_netlog_params.cc
+++ b/net/url_request/url_request_netlog_params.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request_netlog_params.h"
+#include <utility>
+
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "url/gurl.h"
@@ -24,7 +26,7 @@
dict->SetString("priority", RequestPriorityToString(priority));
if (upload_id > -1)
dict->SetString("upload_id", base::Int64ToString(upload_id));
- return dict.Pass();
+ return std::move(dict);
}
} // namespace net
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 317ee749..b3c03c71 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -4,6 +4,8 @@
#include "net/url_request/url_request_test_util.h"
+#include <utility>
+
#include "base/compiler_specific.h"
#include "base/location.h"
#include "base/logging.h"
@@ -143,7 +145,7 @@
TestURLRequestContextGetter::TestURLRequestContextGetter(
const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
scoped_ptr<TestURLRequestContext> context)
- : network_task_runner_(network_task_runner), context_(context.Pass()) {
+ : network_task_runner_(network_task_runner), context_(std::move(context)) {
DCHECK(network_task_runner_.get());
}
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 63e36c1..1a829d5c 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -7,9 +7,9 @@
#include <stdint.h>
#include <stdlib.h>
-
#include <map>
#include <string>
+#include <utility>
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
@@ -71,11 +71,11 @@
void set_http_network_session_params(
scoped_ptr<HttpNetworkSession::Params> params) {
- http_network_session_params_ = params.Pass();
+ http_network_session_params_ = std::move(params);
}
void SetSdchManager(scoped_ptr<SdchManager> sdch_manager) {
- context_storage_.set_sdch_manager(sdch_manager.Pass());
+ context_storage_.set_sdch_manager(std::move(sdch_manager));
}
private:
diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc
index 8b8fae9..7c85edc 100644
--- a/net/url_request/url_request_throttler_entry.cc
+++ b/net/url_request/url_request_throttler_entry.cc
@@ -5,6 +5,7 @@
#include "net/url_request/url_request_throttler_entry.h"
#include <cmath>
+#include <utility>
#include "base/logging.h"
#include "base/metrics/field_trial.h"
@@ -57,7 +58,7 @@
dict->SetInteger("num_failures", num_failures);
dict->SetInteger("release_after_ms",
static_cast<int>(release_after.InMilliseconds()));
- return dict.Pass();
+ return std::move(dict);
}
URLRequestThrottlerEntry::URLRequestThrottlerEntry(
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 6811c8f2..eea6a69 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <utility>
+
#include "build/build_config.h"
#if defined(OS_WIN)
@@ -315,7 +317,7 @@
scoped_ptr<UploadDataStream> CreateSimpleUploadData(const char* data) {
scoped_ptr<UploadElementReader> reader(
new UploadBytesElementReader(data, strlen(data)));
- return ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0);
+ return ElementsUploadDataStream::CreateWithReader(std::move(reader), 0);
}
// Verify that the SSLInfo of a successful SSL connection has valid values.
@@ -1546,7 +1548,7 @@
void SetUpFactory() override {
interceptor_ = new MockURLRequestInterceptor();
job_factory_.reset(new URLRequestInterceptingJobFactory(
- job_factory_.Pass(), make_scoped_ptr(interceptor_)));
+ std::move(job_factory_), make_scoped_ptr(interceptor_)));
}
MockURLRequestInterceptor* interceptor() const {
@@ -3331,7 +3333,7 @@
http_response->set_code(HTTP_FOUND);
http_response->AddCustomHeader("Location",
"http://www.destination.com/foo.js");
- return http_response.Pass();
+ return std::move(http_response);
}
} // namespace
@@ -4196,7 +4198,7 @@
http_response->set_code(HTTP_UNAUTHORIZED);
http_response->AddCustomHeader("WWW-Authenticate",
"Basic realm=\"WallyWorld\"");
- return http_response.Pass();
+ return std::move(http_response);
}
} // namespace
@@ -7394,7 +7396,7 @@
default_context_.http_transaction_factory()->GetSession()));
network_layer->OnSuspend();
- HttpCache http_cache(network_layer.Pass(),
+ HttpCache http_cache(std::move(network_layer),
HttpCache::DefaultBackend::InMemory(0), true);
TestURLRequestContext context(true);
@@ -7540,7 +7542,7 @@
void SetUpFactory() override {
interceptor_ = new MockURLRequestInterceptor();
job_factory_.reset(new URLRequestInterceptingJobFactory(
- job_factory_.Pass(), make_scoped_ptr(interceptor_)));
+ std::move(job_factory_), make_scoped_ptr(interceptor_)));
}
MockURLRequestInterceptor* interceptor() const {
