| Index: chrome/browser/extensions/api/dns/dns_api.cc
|
| diff --git a/chrome/browser/extensions/api/dns/dns_api.cc b/chrome/browser/extensions/api/dns/dns_api.cc
|
| index 11a0537c7ed7dc4007a8aa15b31e1c7172110f4d..6e845ea329578195c001f0b7d9ce65902238a531 100644
|
| --- a/chrome/browser/extensions/api/dns/dns_api.cc
|
| +++ b/chrome/browser/extensions/api/dns/dns_api.cc
|
| @@ -22,9 +22,9 @@ namespace Resolve = extensions::api::experimental::Resolve;
|
| namespace extensions {
|
|
|
| // static
|
| -net::HostResolver* DNSResolveFunction::host_resolver_for_testing;
|
| +net::HostResolver* DnsResolveFunction::host_resolver_for_testing;
|
|
|
| -DNSResolveFunction::DNSResolveFunction()
|
| +DnsResolveFunction::DnsResolveFunction()
|
| : response_(false),
|
| io_thread_(g_browser_process->io_thread()),
|
| capturing_bound_net_log_(new net::CapturingBoundNetLog(
|
| @@ -33,16 +33,16 @@ DNSResolveFunction::DNSResolveFunction()
|
| addresses_(new net::AddressList) {
|
| }
|
|
|
| -DNSResolveFunction::~DNSResolveFunction() {
|
| +DnsResolveFunction::~DnsResolveFunction() {
|
| }
|
|
|
| // static
|
| -void DNSResolveFunction::set_host_resolver_for_testing(
|
| +void DnsResolveFunction::set_host_resolver_for_testing(
|
| net::HostResolver* host_resolver_for_testing_param) {
|
| host_resolver_for_testing = host_resolver_for_testing_param;
|
| }
|
|
|
| -bool DNSResolveFunction::RunImpl() {
|
| +bool DnsResolveFunction::RunImpl() {
|
| scoped_ptr<Resolve::Params> params(Resolve::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -50,12 +50,12 @@ bool DNSResolveFunction::RunImpl() {
|
|
|
| bool result = BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&DNSResolveFunction::WorkOnIOThread, this));
|
| + base::Bind(&DnsResolveFunction::WorkOnIOThread, this));
|
| DCHECK(result);
|
| return true;
|
| }
|
|
|
| -void DNSResolveFunction::WorkOnIOThread() {
|
| +void DnsResolveFunction::WorkOnIOThread() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| net::HostResolver* host_resolver = host_resolver_for_testing ?
|
| @@ -71,7 +71,7 @@ void DNSResolveFunction::WorkOnIOThread() {
|
| net::HostResolver::RequestInfo request_info(host_port_pair);
|
| int resolve_result = host_resolver->Resolve(
|
| request_info, addresses_.get(),
|
| - base::Bind(&DNSResolveFunction::OnLookupFinished, this),
|
| + base::Bind(&DnsResolveFunction::OnLookupFinished, this),
|
| request_handle_.get(), capturing_bound_net_log_->bound());
|
|
|
| // Balanced in OnLookupFinished.
|
| @@ -81,7 +81,7 @@ void DNSResolveFunction::WorkOnIOThread() {
|
| OnLookupFinished(resolve_result);
|
| }
|
|
|
| -void DNSResolveFunction::OnLookupFinished(int resolve_result) {
|
| +void DnsResolveFunction::OnLookupFinished(int resolve_result) {
|
|
|
| scoped_ptr<ResolveCallbackResolveInfo> resolve_info(
|
| new ResolveCallbackResolveInfo());
|
| @@ -97,13 +97,13 @@ void DNSResolveFunction::OnLookupFinished(int resolve_result) {
|
|
|
| bool post_task_result = BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&DNSResolveFunction::RespondOnUIThread, this));
|
| + base::Bind(&DnsResolveFunction::RespondOnUIThread, this));
|
| DCHECK(post_task_result);
|
|
|
| Release(); // Added in WorkOnIOThread().
|
| }
|
|
|
| -void DNSResolveFunction::RespondOnUIThread() {
|
| +void DnsResolveFunction::RespondOnUIThread() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| SendResponse(response_);
|
| }
|
|
|