Flip: Comma delimit the various flip options. Redo the fixed testing server flags.

Renames --testing-fixed-server to --testing-fixed-host.  Adds --testing-fixed-http-port and --testing-fixed-https-port.

Review URL: http://codereview.chromium.org/501032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34624 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index f378f27..01debdb 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -644,6 +644,20 @@ int BrowserMain(const MainFunctionParams& parameters) {
     net::CookieMonster::EnableFileScheme();
   }
 
+  if (parsed_command_line.HasSwitch(switches::kFixedHttpPort)) {
+    std::string http_port_str =
+        parsed_command_line.GetSwitchValueASCII(switches::kFixedHttpPort);
+    int http_port = StringToInt(http_port_str);
+    net::HttpNetworkSession::set_fixed_http_port(http_port);
+  }
+
+  if (parsed_command_line.HasSwitch(switches::kFixedHttpsPort)) {
+    std::string https_port_str =
+        parsed_command_line.GetSwitchValueASCII(switches::kFixedHttpsPort);
+    int https_port = StringToInt(https_port_str);
+    net::HttpNetworkSession::set_fixed_https_port(https_port);
+  }
+
   // Initialize histogram statistics gathering system.
   StatisticsRecorder statistics;