Revert 49489 - Use NSS for SSL by default on Mac OS X.

To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows.  All other programs are hardcoded to use NSS for SSL.

If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.

R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2747002

TBR=wtc@chromium.org
Review URL: http://codereview.chromium.org/2775005

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

1 files changed, 7 insertions, 4 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 557c1c1..a4a2ca4 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -913,10 +913,9 @@ const char kStartupManifest[]               = "startup-manifest";
 const char kVertScrollDelta[]               = "vert-scroll-delta";
 #endif
 
-#if defined(OS_MACOSX) || defined(OS_WIN)
-// Use the system SSL library (Secure Transport on Mac, SChannel on Windows)
-// instead of NSS for SSL.
-const char kUseSystemSSL[]                  = "use-system-ssl";
+#if defined(OS_WIN)
+// Use SChannel (the system SSL library on Windows) instead of NSS for SSL.
+const char kUseSChannel[]                   = "use-schannel";
 #endif
 
 #if defined(OS_POSIX)
@@ -941,6 +940,10 @@ const char kEnableSandboxLogging[]          = "enable-sandbox-logging";
 // Temporary flag to prevent Flash from negotiating the Core Animation drawing
 // model. This will be removed once the last issues have been resolved.
 const char kDisableFlashCoreAnimation[]     = "disable-flash-core-animation";
+
+// Use NSS instead of the system SSL library for SSL.
+// This is a temporary testing flag.
+const char kUseNSSForSSL[]                  = "use-nss-for-ssl";
 #else
 // Enable Kiosk mode.
 const char kKioskMode[]                     = "kiosk";