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

Unified Diff: src/net/base/host_resolver_impl_unittest.cc

Issue 7046011: Merge 84251, 85083, 85188, 85375, 77501. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/696/
Patch Set: Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/net/base/address_list.cc ('k') | src/net/base/mock_host_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/net/base/host_resolver_impl_unittest.cc
===================================================================
--- src/net/base/host_resolver_impl_unittest.cc (revision 85857)
+++ src/net/base/host_resolver_impl_unittest.cc (working copy)
@@ -1665,10 +1665,10 @@
new RuleBasedHostResolverProc(NULL));
resolver_proc->AddRule("just.testing", "192.168.1.42");
- scoped_ptr<HostResolver> host_resolver(
+ scoped_ptr<HostResolver> host_resolver(
CreateHostResolverImpl(resolver_proc));
- // First hit will miss the cache.
+ // First hit will miss the cache.
HostResolver::RequestInfo info(HostPortPair("just.testing", kPortnum));
info.set_only_use_cached_response(true);
CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
« no previous file with comments | « src/net/base/address_list.cc ('k') | src/net/base/mock_host_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698