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

Side by Side Diff: net/proxy/proxy_resolver_factory_mojo.cc

Issue 2083433002: Mojo: Remove url type converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
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/proxy_resolver_factory_mojo.h" 5 #include "net/proxy/proxy_resolver_factory_mojo.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "mojo/common/common_type_converters.h" 17 #include "mojo/common/common_type_converters.h"
18 #include "mojo/common/url_type_converters.h"
19 #include "mojo/public/cpp/bindings/binding.h" 18 #include "mojo/public/cpp/bindings/binding.h"
20 #include "net/base/load_states.h" 19 #include "net/base/load_states.h"
21 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
22 #include "net/dns/mojo_host_resolver_impl.h" 21 #include "net/dns/mojo_host_resolver_impl.h"
23 #include "net/interfaces/host_resolver_service.mojom.h" 22 #include "net/interfaces/host_resolver_service.mojom.h"
24 #include "net/interfaces/proxy_resolver_service.mojom.h" 23 #include "net/interfaces/proxy_resolver_service.mojom.h"
25 #include "net/proxy/mojo_proxy_resolver_factory.h" 24 #include "net/proxy/mojo_proxy_resolver_factory.h"
26 #include "net/proxy/mojo_proxy_type_converters.h" 25 #include "net/proxy/mojo_proxy_type_converters.h"
27 #include "net/proxy/proxy_info.h" 26 #include "net/proxy/proxy_info.h"
28 #include "net/proxy/proxy_resolver.h" 27 #include "net/proxy/proxy_resolver.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 resolver->host_resolver_, 192 resolver->host_resolver_,
194 resolver->error_observer_.get(), 193 resolver->error_observer_.get(),
195 resolver->net_log_, 194 resolver->net_log_,
196 net_log), 195 net_log),
197 resolver_(resolver), 196 resolver_(resolver),
198 url_(url), 197 url_(url),
199 results_(results), 198 results_(results),
200 callback_(callback), 199 callback_(callback),
201 binding_(this) { 200 binding_(this) {
202 resolver_->mojo_proxy_resolver_ptr_->GetProxyForUrl( 201 resolver_->mojo_proxy_resolver_ptr_->GetProxyForUrl(
203 mojo::String::From(url_), binding_.CreateInterfacePtrAndBind()); 202 url_, binding_.CreateInterfacePtrAndBind());
204 binding_.set_connection_error_handler(base::Bind( 203 binding_.set_connection_error_handler(base::Bind(
205 &ProxyResolverMojo::Job::OnConnectionError, base::Unretained(this))); 204 &ProxyResolverMojo::Job::OnConnectionError, base::Unretained(this)));
206 } 205 }
207 206
208 ProxyResolverMojo::Job::~Job() { 207 ProxyResolverMojo::Job::~Job() {
209 DCHECK(thread_checker_.CalledOnValidThread()); 208 DCHECK(thread_checker_.CalledOnValidThread());
210 if (!callback_.is_null()) 209 if (!callback_.is_null())
211 callback_.Run(ERR_PAC_SCRIPT_TERMINATED); 210 callback_.Run(ERR_PAC_SCRIPT_TERMINATED);
212 } 211 }
213 212
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 return ERR_PAC_SCRIPT_FAILED; 400 return ERR_PAC_SCRIPT_FAILED;
402 } 401 }
403 request->reset(new Job(this, pac_script, resolver, callback, 402 request->reset(new Job(this, pac_script, resolver, callback,
404 error_observer_factory_.is_null() 403 error_observer_factory_.is_null()
405 ? nullptr 404 ? nullptr
406 : error_observer_factory_.Run())); 405 : error_observer_factory_.Run()));
407 return ERR_IO_PENDING; 406 return ERR_IO_PENDING;
408 } 407 }
409 408
410 } // namespace net 409 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/mojo_proxy_resolver_impl_unittest.cc ('k') | net/proxy/proxy_resolver_factory_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698