| OLD | NEW |
| 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_impl.h" | 5 #include "net/proxy/mojo_proxy_resolver_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "mojo/common/url_type_converters.h" | |
| 13 #include "net/base/net_errors.h" | 12 #include "net/base/net_errors.h" |
| 14 #include "net/log/net_log.h" | 13 #include "net/log/net_log.h" |
| 15 #include "net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h" | 14 #include "net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h" |
| 16 #include "net/proxy/mojo_proxy_type_converters.h" | 15 #include "net/proxy/mojo_proxy_type_converters.h" |
| 17 #include "net/proxy/proxy_info.h" | 16 #include "net/proxy/proxy_info.h" |
| 18 #include "net/proxy/proxy_resolver_script_data.h" | 17 #include "net/proxy/proxy_resolver_script_data.h" |
| 19 #include "net/proxy/proxy_resolver_v8_tracing.h" | 18 #include "net/proxy/proxy_resolver_v8_tracing.h" |
| 20 | 19 |
| 21 namespace net { | 20 namespace net { |
| 22 | 21 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 49 | 48 |
| 50 MojoProxyResolverImpl::MojoProxyResolverImpl( | 49 MojoProxyResolverImpl::MojoProxyResolverImpl( |
| 51 std::unique_ptr<ProxyResolverV8Tracing> resolver) | 50 std::unique_ptr<ProxyResolverV8Tracing> resolver) |
| 52 : resolver_(std::move(resolver)) {} | 51 : resolver_(std::move(resolver)) {} |
| 53 | 52 |
| 54 MojoProxyResolverImpl::~MojoProxyResolverImpl() { | 53 MojoProxyResolverImpl::~MojoProxyResolverImpl() { |
| 55 STLDeleteElements(&resolve_jobs_); | 54 STLDeleteElements(&resolve_jobs_); |
| 56 } | 55 } |
| 57 | 56 |
| 58 void MojoProxyResolverImpl::GetProxyForUrl( | 57 void MojoProxyResolverImpl::GetProxyForUrl( |
| 59 const mojo::String& url, | 58 const GURL& url, |
| 60 interfaces::ProxyResolverRequestClientPtr client) { | 59 interfaces::ProxyResolverRequestClientPtr client) { |
| 61 DVLOG(1) << "GetProxyForUrl(" << url << ")"; | 60 DVLOG(1) << "GetProxyForUrl(" << url << ")"; |
| 62 Job* job = new Job(std::move(client), this, url.To<GURL>()); | 61 Job* job = new Job(std::move(client), this, url); |
| 63 bool inserted = resolve_jobs_.insert(job).second; | 62 bool inserted = resolve_jobs_.insert(job).second; |
| 64 DCHECK(inserted); | 63 DCHECK(inserted); |
| 65 job->Start(); | 64 job->Start(); |
| 66 } | 65 } |
| 67 | 66 |
| 68 void MojoProxyResolverImpl::DeleteJob(Job* job) { | 67 void MojoProxyResolverImpl::DeleteJob(Job* job) { |
| 69 size_t num_erased = resolve_jobs_.erase(job); | 68 size_t num_erased = resolve_jobs_.erase(job); |
| 70 DCHECK(num_erased); | 69 DCHECK(num_erased); |
| 71 delete job; | 70 delete job; |
| 72 } | 71 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 } | 109 } |
| 111 client_->ReportResult(error, std::move(result)); | 110 client_->ReportResult(error, std::move(result)); |
| 112 resolver_->DeleteJob(this); | 111 resolver_->DeleteJob(this); |
| 113 } | 112 } |
| 114 | 113 |
| 115 void MojoProxyResolverImpl::Job::OnConnectionError() { | 114 void MojoProxyResolverImpl::Job::OnConnectionError() { |
| 116 resolver_->DeleteJob(this); | 115 resolver_->DeleteJob(this); |
| 117 } | 116 } |
| 118 | 117 |
| 119 } // namespace net | 118 } // namespace net |
| OLD | NEW |