diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 23:06:27 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 23:06:27 +0000 |
commit | 9f651d04dd719ecfafe9dfbee4c742879edf4fca (patch) | |
tree | 988810f9fd860c0c42943b549f3ddd04e290e9d4 /chrome/browser | |
parent | fcbff851ba11ef0b8c26344c47a07037d782f436 (diff) | |
download | chromium_src-9f651d04dd719ecfafe9dfbee4c742879edf4fca.zip chromium_src-9f651d04dd719ecfafe9dfbee4c742879edf4fca.tar.gz chromium_src-9f651d04dd719ecfafe9dfbee4c742879edf4fca.tar.bz2 |
Remove the command line flag --testing-fixed-host.
This has been superceded by --host-resolver-rules.
(Instead of --testing-fixed-host="foobar" one would use --host-resolver-rules="MAP * foobar")
BUG=36053
Review URL: http://codereview.chromium.org/647005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/io_thread.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 1aafdf4..4ee6814 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -50,25 +50,15 @@ net::HostResolver* CreateGlobalHostResolver( global_host_resolver->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4); } - std::string hostname_remappings; - - if (command_line.HasSwitch(switches::kFixedHost)) { - std::string host = - command_line.GetSwitchValueASCII(switches::kFixedHost); - hostname_remappings = StringPrintf("MAP * %s", host.c_str()); - } else if (command_line.HasSwitch(switches::kHostResolverRules)) { - hostname_remappings = - command_line.GetSwitchValueASCII(switches::kHostResolverRules); - } - // If hostname remappings were specified on the command-line, layer these // rules on top of the real host resolver. This allows forwarding all requests // through a designated test server. - if (!hostname_remappings.empty()) { + if (command_line.HasSwitch(switches::kHostResolverRules)) { net::MappedHostResolver* remapped_resolver = new net::MappedHostResolver(global_host_resolver); global_host_resolver = remapped_resolver; - remapped_resolver->SetRulesFromString(hostname_remappings); + remapped_resolver->SetRulesFromString( + command_line.GetSwitchValueASCII(switches::kHostResolverRules)); } return global_host_resolver; |