mac: Fix a few compile errors with the 10.8 SDK

chrome/browser/ui/website_settings/website_settings_unittest.cc

Index: chrome/browser/ui/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index 27ebd591b3a051fbad1e2d8d4e6201a14d3a817e..b5c8d919450b0863eeb2d28b6cc34baf09096f56 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -31,7 +31,8 @@ using namespace testing;
 namespace {
 
 // SSL cipher suite like specified in RFC5246 Appendix A.5. "The Cipher Suite".
-static int TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x3D;
+// Without the CR_ prefix, this clashes with the OS X 10.8 headers.
+int CR_TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x3D;
 
 int SetSSLVersion(int connection_status, int version) {
   // Clear SSL version bits (Bits 20, 21 and 22).
@@ -222,7 +223,7 @@ TEST_F(WebsiteSettingsTest, HTTPSConnection) {
   ssl_.security_bits = 81;  // No error if > 80.
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, TLS_RSA_WITH_AES_256_CBC_SHA256);
+  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());
@@ -242,7 +243,7 @@ TEST_F(WebsiteSettingsTest, HTTPSMixedContent) {
   ssl_.content_status = SSLStatus::DISPLAYED_INSECURE_CONTENT;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, TLS_RSA_WITH_AES_256_CBC_SHA256);
+  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());
@@ -270,7 +271,7 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
   ssl_.content_status = SSLStatus::DISPLAYED_INSECURE_CONTENT;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, TLS_RSA_WITH_AES_256_CBC_SHA256);
+  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());
@@ -289,7 +290,7 @@ TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
   ssl_.security_bits = 81;  // No error if > 80.
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, TLS_RSA_WITH_AES_256_CBC_SHA256);
+  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());
@@ -308,7 +309,7 @@ TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
   ssl_.security_bits = 1;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, TLS_RSA_WITH_AES_256_CBC_SHA256);
+  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());