Index: net/dns/host_resolver_impl.cc |
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc |
index 9c0a5bb943f3360c70b7b4a0fc0f24ffda4804cd..fdc934dbd39ed7bec306bf111ac23b065769f55f 100644 |
--- a/net/dns/host_resolver_impl.cc |
+++ b/net/dns/host_resolver_impl.cc |
@@ -21,7 +21,6 @@ |
#include "base/compiler_specific.h" |
#include "base/debug/debugger.h" |
#include "base/debug/stack_trace.h" |
-#include "base/message_loop/message_loop_proxy.h" |
#include "base/metrics/field_trial.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/metrics/sparse_histogram.h" |
@@ -29,6 +28,7 @@ |
#include "base/stl_util.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "base/thread_task_runner_handle.h" |
#include "base/threading/worker_pool.h" |
#include "base/time/time.h" |
#include "base/values.h" |
@@ -279,8 +279,10 @@ bool ConfigureAsyncDnsNoFallbackFieldTrial() { |
// groups SystemDnsA and SystemDnsB: return false, |
// otherwise (trial absent): return default. |
std::string group_name = base::FieldTrialList::FindFullName("AsyncDns"); |
- if (!group_name.empty()) |
- return StartsWithASCII(group_name, "AsyncDnsNoFallback", false); |
+ if (!group_name.empty()) { |
+ return base::StartsWith(group_name, "AsyncDnsNoFallback", |
+ base::CompareCase::INSENSITIVE_ASCII); |
+ } |
return kDefault; |
} |
@@ -592,7 +594,7 @@ class HostResolverImpl::ProcTask |
: key_(key), |
params_(params), |
callback_(callback), |
- origin_loop_(base::MessageLoopProxy::current()), |
+ origin_loop_(base::ThreadTaskRunnerHandle::Get()), |
attempt_number_(0), |
completed_attempt_number_(0), |
completed_attempt_error_(ERR_UNEXPECTED), |
@@ -923,7 +925,7 @@ class HostResolverImpl::ProcTask |
Callback callback_; |
// Used to post ourselves onto the origin thread. |
- scoped_refptr<base::MessageLoopProxy> origin_loop_; |
+ scoped_refptr<base::SingleThreadTaskRunner> origin_loop_; |
// Keeps track of the number of attempts we have made so far to resolve the |
// host. Whenever we start an attempt to resolve the host, we increase this |