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

Side by Side Diff: net/proxy/mojo_proxy_resolver_factory_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 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 unified diff | Download patch
« no previous file with comments | « net/proxy/mojo_proxy_resolver_factory_impl.cc ('k') | net/proxy/mojo_proxy_resolver_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" 5 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
6 6
7 #include <utility>
8
7 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
8 #include "mojo/public/cpp/bindings/binding.h" 10 #include "mojo/public/cpp/bindings/binding.h"
9 #include "net/base/test_completion_callback.h" 11 #include "net/base/test_completion_callback.h"
10 #include "net/proxy/mock_proxy_resolver.h" 12 #include "net/proxy/mock_proxy_resolver.h"
11 #include "net/proxy/proxy_resolver_v8_tracing.h" 13 #include "net/proxy/proxy_resolver_v8_tracing.h"
12 #include "net/test/event_waiter.h" 14 #include "net/test/event_waiter.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 16
15 namespace net { 17 namespace net {
16 namespace { 18 namespace {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 128
127 EventWaiter<Event> waiter_; 129 EventWaiter<Event> waiter_;
128 }; 130 };
129 131
130 TEST_F(MojoProxyResolverFactoryImplTest, DisconnectProxyResolverClient) { 132 TEST_F(MojoProxyResolverFactoryImplTest, DisconnectProxyResolverClient) {
131 interfaces::ProxyResolverPtr proxy_resolver; 133 interfaces::ProxyResolverPtr proxy_resolver;
132 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr; 134 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
133 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding( 135 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
134 this, mojo::GetProxy(&client_ptr)); 136 this, mojo::GetProxy(&client_ptr));
135 factory_->CreateResolver(mojo::String::From(kScriptData), 137 factory_->CreateResolver(mojo::String::From(kScriptData),
136 mojo::GetProxy(&proxy_resolver), client_ptr.Pass()); 138 mojo::GetProxy(&proxy_resolver),
139 std::move(client_ptr));
137 proxy_resolver.set_connection_error_handler( 140 proxy_resolver.set_connection_error_handler(
138 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError, 141 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
139 base::Unretained(this))); 142 base::Unretained(this)));
140 waiter_.WaitForEvent(RESOLVER_CREATED); 143 waiter_.WaitForEvent(RESOLVER_CREATED);
141 EXPECT_EQ(0, instances_destroyed_); 144 EXPECT_EQ(0, instances_destroyed_);
142 ASSERT_EQ(1u, mock_factory_->requests_handled()); 145 ASSERT_EQ(1u, mock_factory_->requests_handled());
143 TestCompletionCallback create_callback; 146 TestCompletionCallback create_callback;
144 create_callback_ = create_callback.callback(); 147 create_callback_ = create_callback.callback();
145 ASSERT_TRUE(mock_factory_->pending_request()); 148 ASSERT_TRUE(mock_factory_->pending_request());
146 mock_factory_->pending_request()->resolver->reset( 149 mock_factory_->pending_request()->resolver->reset(
147 new FakeProxyResolver(base::Bind( 150 new FakeProxyResolver(base::Bind(
148 &MojoProxyResolverFactoryImplTest::OnFakeProxyInstanceDestroyed, 151 &MojoProxyResolverFactoryImplTest::OnFakeProxyInstanceDestroyed,
149 base::Unretained(this)))); 152 base::Unretained(this))));
150 mock_factory_->pending_request()->callback.Run(OK); 153 mock_factory_->pending_request()->callback.Run(OK);
151 EXPECT_EQ(OK, create_callback.WaitForResult()); 154 EXPECT_EQ(OK, create_callback.WaitForResult());
152 proxy_resolver.reset(); 155 proxy_resolver.reset();
153 waiter_.WaitForEvent(RESOLVER_DESTROYED); 156 waiter_.WaitForEvent(RESOLVER_DESTROYED);
154 EXPECT_EQ(1, instances_destroyed_); 157 EXPECT_EQ(1, instances_destroyed_);
155 } 158 }
156 159
157 TEST_F(MojoProxyResolverFactoryImplTest, Error) { 160 TEST_F(MojoProxyResolverFactoryImplTest, Error) {
158 interfaces::ProxyResolverPtr proxy_resolver; 161 interfaces::ProxyResolverPtr proxy_resolver;
159 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr; 162 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
160 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding( 163 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
161 this, mojo::GetProxy(&client_ptr)); 164 this, mojo::GetProxy(&client_ptr));
162 factory_->CreateResolver(mojo::String::From(kScriptData), 165 factory_->CreateResolver(mojo::String::From(kScriptData),
163 mojo::GetProxy(&proxy_resolver), client_ptr.Pass()); 166 mojo::GetProxy(&proxy_resolver),
167 std::move(client_ptr));
164 proxy_resolver.set_connection_error_handler( 168 proxy_resolver.set_connection_error_handler(
165 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError, 169 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
166 base::Unretained(this))); 170 base::Unretained(this)));
167 waiter_.WaitForEvent(RESOLVER_CREATED); 171 waiter_.WaitForEvent(RESOLVER_CREATED);
168 EXPECT_EQ(0, instances_destroyed_); 172 EXPECT_EQ(0, instances_destroyed_);
169 ASSERT_EQ(1u, mock_factory_->requests_handled()); 173 ASSERT_EQ(1u, mock_factory_->requests_handled());
170 TestCompletionCallback create_callback; 174 TestCompletionCallback create_callback;
171 create_callback_ = create_callback.callback(); 175 create_callback_ = create_callback.callback();
172 ASSERT_TRUE(mock_factory_->pending_request()); 176 ASSERT_TRUE(mock_factory_->pending_request());
173 mock_factory_->pending_request()->callback.Run(ERR_PAC_SCRIPT_FAILED); 177 mock_factory_->pending_request()->callback.Run(ERR_PAC_SCRIPT_FAILED);
174 EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, create_callback.WaitForResult()); 178 EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, create_callback.WaitForResult());
175 } 179 }
176 180
177 TEST_F(MojoProxyResolverFactoryImplTest, 181 TEST_F(MojoProxyResolverFactoryImplTest,
178 DisconnectClientDuringResolverCreation) { 182 DisconnectClientDuringResolverCreation) {
179 interfaces::ProxyResolverPtr proxy_resolver; 183 interfaces::ProxyResolverPtr proxy_resolver;
180 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr; 184 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
181 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding( 185 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
182 this, mojo::GetProxy(&client_ptr)); 186 this, mojo::GetProxy(&client_ptr));
183 factory_->CreateResolver(mojo::String::From(kScriptData), 187 factory_->CreateResolver(mojo::String::From(kScriptData),
184 mojo::GetProxy(&proxy_resolver), client_ptr.Pass()); 188 mojo::GetProxy(&proxy_resolver),
189 std::move(client_ptr));
185 proxy_resolver.set_connection_error_handler( 190 proxy_resolver.set_connection_error_handler(
186 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError, 191 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
187 base::Unretained(this))); 192 base::Unretained(this)));
188 waiter_.WaitForEvent(RESOLVER_CREATED); 193 waiter_.WaitForEvent(RESOLVER_CREATED);
189 EXPECT_EQ(0, instances_destroyed_); 194 EXPECT_EQ(0, instances_destroyed_);
190 ASSERT_EQ(1u, mock_factory_->requests_handled()); 195 ASSERT_EQ(1u, mock_factory_->requests_handled());
191 client_binding.Close(); 196 client_binding.Close();
192 waiter_.WaitForEvent(CONNECTION_ERROR); 197 waiter_.WaitForEvent(CONNECTION_ERROR);
193 } 198 }
194 199
195 TEST_F(MojoProxyResolverFactoryImplTest, 200 TEST_F(MojoProxyResolverFactoryImplTest,
196 DisconnectFactoryDuringResolverCreation) { 201 DisconnectFactoryDuringResolverCreation) {
197 interfaces::ProxyResolverPtr proxy_resolver; 202 interfaces::ProxyResolverPtr proxy_resolver;
198 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr; 203 interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
199 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding( 204 mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
200 this, mojo::GetProxy(&client_ptr)); 205 this, mojo::GetProxy(&client_ptr));
201 factory_->CreateResolver(mojo::String::From(kScriptData), 206 factory_->CreateResolver(mojo::String::From(kScriptData),
202 mojo::GetProxy(&proxy_resolver), client_ptr.Pass()); 207 mojo::GetProxy(&proxy_resolver),
208 std::move(client_ptr));
203 proxy_resolver.set_connection_error_handler( 209 proxy_resolver.set_connection_error_handler(
204 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError, 210 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
205 base::Unretained(this))); 211 base::Unretained(this)));
206 client_binding.set_connection_error_handler( 212 client_binding.set_connection_error_handler(
207 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError, 213 base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
208 base::Unretained(this))); 214 base::Unretained(this)));
209 waiter_.WaitForEvent(RESOLVER_CREATED); 215 waiter_.WaitForEvent(RESOLVER_CREATED);
210 EXPECT_EQ(0, instances_destroyed_); 216 EXPECT_EQ(0, instances_destroyed_);
211 ASSERT_EQ(1u, mock_factory_->requests_handled()); 217 ASSERT_EQ(1u, mock_factory_->requests_handled());
212 factory_.reset(); 218 factory_.reset();
213 waiter_.WaitForEvent(CONNECTION_ERROR); 219 waiter_.WaitForEvent(CONNECTION_ERROR);
214 } 220 }
215 221
216 } // namespace net 222 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/mojo_proxy_resolver_factory_impl.cc ('k') | net/proxy/mojo_proxy_resolver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698