diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 19:54:37 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 19:54:37 +0000 |
| commit | 39588997bced271d4f1f199e7fd99b51438d080e (patch) | |
| tree | 09f3869fd0c89efad297de22943ba3e833a8fbb5 /net/base/mock_host_resolver.cc | |
| parent | 76730d0e90f60b0e9b1d4b89d2387855211c59a3 (diff) | |
| download | chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.zip chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.tar.gz chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.tar.bz2 | |
Upstream android net related code (part 1)
BUG=
TEST=
Review URL: http://codereview.chromium.org/7277057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mock_host_resolver.cc')
| -rw-r--r-- | net/base/mock_host_resolver.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc index d8f3acb..3cc4a82 100644 --- a/net/base/mock_host_resolver.cc +++ b/net/base/mock_host_resolver.cc @@ -63,7 +63,13 @@ void MockHostResolverBase::Reset(HostResolverProc* interceptor) { // At the root of the chain, map everything to localhost. scoped_refptr<RuleBasedHostResolverProc> catchall( new RuleBasedHostResolverProc(NULL)); +#if defined(OS_ANDROID) + // In Android emulator, the development machine's '127.0.0.1' is mapped to + // '10.0.2.2'. + catchall->AddRule("*", "10.0.2.2"); +#else catchall->AddRule("*", "127.0.0.1"); +#endif // Next add a rules-based layer the use controls. rules_ = new RuleBasedHostResolverProc(catchall); |