| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/api/dns/dns_api.h" | 5 #include "extensions/browser/api/dns/dns_api.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/profiler/scoped_tracker.h" | |
| 9 #include "base/values.h" | 8 #include "base/values.h" |
| 10 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
| 11 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| 12 #include "content/public/browser/resource_context.h" | 11 #include "content/public/browser/resource_context.h" |
| 13 #include "extensions/browser/api/dns/host_resolver_wrapper.h" | 12 #include "extensions/browser/api/dns/host_resolver_wrapper.h" |
| 14 #include "extensions/common/api/dns.h" | 13 #include "extensions/common/api/dns.h" |
| 15 #include "net/base/host_port_pair.h" | 14 #include "net/base/host_port_pair.h" |
| 16 #include "net/base/net_errors.h" | 15 #include "net/base/net_errors.h" |
| 17 #include "net/log/net_log.h" | 16 #include "net/log/net_log.h" |
| 18 | 17 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 if (resolve_result != net::ERR_IO_PENDING) | 73 if (resolve_result != net::ERR_IO_PENDING) |
| 75 OnLookupFinished(resolve_result); | 74 OnLookupFinished(resolve_result); |
| 76 } | 75 } |
| 77 | 76 |
| 78 void DnsResolveFunction::RespondOnUIThread() { | 77 void DnsResolveFunction::RespondOnUIThread() { |
| 79 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 78 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 80 SendResponse(response_); | 79 SendResponse(response_); |
| 81 } | 80 } |
| 82 | 81 |
| 83 void DnsResolveFunction::OnLookupFinished(int resolve_result) { | 82 void DnsResolveFunction::OnLookupFinished(int resolve_result) { |
| 84 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. | |
| 85 tracked_objects::ScopedTracker tracking_profile( | |
| 86 FROM_HERE_WITH_EXPLICIT_FUNCTION( | |
| 87 "436634 DnsResolveFunction::OnLookupFinished")); | |
| 88 | |
| 89 scoped_ptr<ResolveCallbackResolveInfo> resolve_info( | 83 scoped_ptr<ResolveCallbackResolveInfo> resolve_info( |
| 90 new ResolveCallbackResolveInfo()); | 84 new ResolveCallbackResolveInfo()); |
| 91 resolve_info->result_code = resolve_result; | 85 resolve_info->result_code = resolve_result; |
| 92 if (resolve_result == net::OK) { | 86 if (resolve_result == net::OK) { |
| 93 DCHECK(!addresses_->empty()); | 87 DCHECK(!addresses_->empty()); |
| 94 resolve_info->address.reset( | 88 resolve_info->address.reset( |
| 95 new std::string(addresses_->front().ToStringWithoutPort())); | 89 new std::string(addresses_->front().ToStringWithoutPort())); |
| 96 } | 90 } |
| 97 results_ = Resolve::Results::Create(*resolve_info); | 91 results_ = Resolve::Results::Create(*resolve_info); |
| 98 response_ = true; | 92 response_ = true; |
| 99 | 93 |
| 100 bool post_task_result = BrowserThread::PostTask( | 94 bool post_task_result = BrowserThread::PostTask( |
| 101 BrowserThread::UI, | 95 BrowserThread::UI, |
| 102 FROM_HERE, | 96 FROM_HERE, |
| 103 base::Bind(&DnsResolveFunction::RespondOnUIThread, this)); | 97 base::Bind(&DnsResolveFunction::RespondOnUIThread, this)); |
| 104 DCHECK(post_task_result); | 98 DCHECK(post_task_result); |
| 105 | 99 |
| 106 Release(); // Added in WorkOnIOThread(). | 100 Release(); // Added in WorkOnIOThread(). |
| 107 } | 101 } |
| 108 | 102 |
| 109 } // namespace extensions | 103 } // namespace extensions |
| OLD | NEW |