diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 12:22:09 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 12:22:09 +0000 |
| commit | e319402b29e7f8ae127e6c39a1adc998a8c5aa8e (patch) | |
| tree | 55b9031ce996dcb778377257d6bed871f77d42c3 /net/base/mock_host_resolver.cc | |
| parent | 8bb9d51cc9eb0e39f2862085eccceed52b2705a1 (diff) | |
| download | chromium_src-e319402b29e7f8ae127e6c39a1adc998a8c5aa8e.zip chromium_src-e319402b29e7f8ae127e6c39a1adc998a8c5aa8e.tar.gz chromium_src-e319402b29e7f8ae127e6c39a1adc998a8c5aa8e.tar.bz2 | |
Use 127.0.0.1 as the local address for Android in the MockHostResolver as well.
This was added in r92040, but broke when the socket_stream_unittests were
changed to use the MockHostResolver in r138413. Presumably the 10.0.2.2 IP is
correct for the emulator, but our bots use devices right now.
BUG=
TEST=Android FYI builder turns green.
Review URL: https://chromiumcodereview.appspot.com/10445012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138785 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, 0 insertions, 6 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc index 156ae8c..cf288f6 100644 --- a/net/base/mock_host_resolver.cc +++ b/net/base/mock_host_resolver.cc @@ -347,13 +347,7 @@ RuleBasedHostResolverProc::~RuleBasedHostResolverProc() { RuleBasedHostResolverProc* CreateCatchAllHostResolverProc() { 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->AddIPLiteralRule("*", "10.0.2.2", "localhost"); -#else catchall->AddIPLiteralRule("*", "127.0.0.1", "localhost"); -#endif // Next add a rules-based layer the use controls. return new RuleBasedHostResolverProc(catchall); |