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

Unified Diff: net/proxy/mojo_proxy_resolver_impl_unittest.cc

Issue 1545233002: Convert Pass()→std::move() in //net (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
« no previous file with comments | « net/proxy/mojo_proxy_resolver_impl.cc ('k') | net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/mojo_proxy_resolver_impl_unittest.cc
diff --git a/net/proxy/mojo_proxy_resolver_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_impl_unittest.cc
index a76c5863aebd4cf1770371a3cac2ec189485d823..b045b27b3008507f88f72db220ed8d34bbcd045d 100644
--- a/net/proxy/mojo_proxy_resolver_impl_unittest.cc
+++ b/net/proxy/mojo_proxy_resolver_impl_unittest.cc
@@ -5,6 +5,7 @@
#include "net/proxy/mojo_proxy_resolver_impl.h"
#include <string>
+#include <utility>
#include <vector>
#include "base/run_loop.h"
@@ -60,7 +61,7 @@ class TestRequestClient : public interfaces::ProxyResolverRequestClient {
TestRequestClient::TestRequestClient(
mojo::InterfaceRequest<interfaces::ProxyResolverRequestClient> request)
- : binding_(this, request.Pass()) {
+ : binding_(this, std::move(request)) {
binding_.set_connection_error_handler(base::Bind(
&TestRequestClient::OnConnectionError, base::Unretained(this)));
}
@@ -79,7 +80,7 @@ void TestRequestClient::ReportResult(
event_waiter_.NotifyEvent(RESULT_RECEIVED);
ASSERT_FALSE(done_);
error_ = static_cast<Error>(error);
- results_ = results.Pass();
+ results_ = std::move(results);
done_ = true;
}
@@ -177,7 +178,7 @@ class MojoProxyResolverImplTest : public testing::Test {
scoped_ptr<MockProxyResolverV8Tracing> mock_resolver(
new MockProxyResolverV8Tracing);
mock_proxy_resolver_ = mock_resolver.get();
- resolver_impl_.reset(new MojoProxyResolverImpl(mock_resolver.Pass()));
+ resolver_impl_.reset(new MojoProxyResolverImpl(std::move(mock_resolver)));
resolver_ = resolver_impl_.get();
}
@@ -191,7 +192,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrl) {
interfaces::ProxyResolverRequestClientPtr client_ptr;
TestRequestClient client(mojo::GetProxy(&client_ptr));
- resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
+ resolver_->GetProxyForUrl("http://example.com", std::move(client_ptr));
ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
const MockProxyResolverV8Tracing::Request& request =
mock_proxy_resolver_->pending_requests()[0];
@@ -238,7 +239,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrlFailure) {
interfaces::ProxyResolverRequestClientPtr client_ptr;
TestRequestClient client(mojo::GetProxy(&client_ptr));
- resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
+ resolver_->GetProxyForUrl("http://example.com", std::move(client_ptr));
ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
const MockProxyResolverV8Tracing::Request& request =
mock_proxy_resolver_->pending_requests()[0];
@@ -258,8 +259,8 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrlMultiple) {
interfaces::ProxyResolverRequestClientPtr client_ptr2;
TestRequestClient client2(mojo::GetProxy(&client_ptr2));
- resolver_->GetProxyForUrl("http://example.com", client_ptr1.Pass());
- resolver_->GetProxyForUrl("https://example.com", client_ptr2.Pass());
+ resolver_->GetProxyForUrl("http://example.com", std::move(client_ptr1));
+ resolver_->GetProxyForUrl("https://example.com", std::move(client_ptr2));
ASSERT_EQ(2u, mock_proxy_resolver_->pending_requests().size());
const MockProxyResolverV8Tracing::Request& request1 =
mock_proxy_resolver_->pending_requests()[0];
@@ -298,7 +299,7 @@ TEST_F(MojoProxyResolverImplTest, DestroyClient) {
scoped_ptr<TestRequestClient> client(
new TestRequestClient(mojo::GetProxy(&client_ptr)));
- resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
+ resolver_->GetProxyForUrl("http://example.com", std::move(client_ptr));
ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
const MockProxyResolverV8Tracing::Request& request =
mock_proxy_resolver_->pending_requests()[0];
@@ -312,7 +313,7 @@ TEST_F(MojoProxyResolverImplTest, DestroyService) {
interfaces::ProxyResolverRequestClientPtr client_ptr;
TestRequestClient client(mojo::GetProxy(&client_ptr));
- resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
+ resolver_->GetProxyForUrl("http://example.com", std::move(client_ptr));
ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
resolver_impl_.reset();
client.event_waiter().WaitForEvent(TestRequestClient::CONNECTION_ERROR);
« no previous file with comments | « net/proxy/mojo_proxy_resolver_impl.cc ('k') | net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698