net: Re-enable SOCKS4 tests on Mac.

The test failures were caused by the bad clang rollout
happend at that time: rbug.com/112977 (memcpy was broken).

BUG=112682
TEST=mac try bot

Review URL: https://chromiumcodereview.appspot.com/9959023

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

3 files changed, 6 insertions, 48 deletions

diff --git a/net/http/http_network_transaction_spdy21_unittest.cc b/net/http/http_network_transaction_spdy21_unittest.cc
index 7e79626..9da8f91 100644
--- a/net/http/http_network_transaction_spdy21_unittest.cc
+++ b/net/http/http_network_transaction_spdy21_unittest.cc
@@ -5351,14 +5351,7 @@ TEST_F(HttpNetworkTransactionSpdy21Test, BuildRequest_ExtraHeadersStripped) {
   EXPECT_EQ(OK, rv);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_HTTP_GET DISABLED_SOCKS4_HTTP_GET
-#else
-#define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy21Test, MAYBE_SOCKS4_HTTP_GET) {
+TEST_F(HttpNetworkTransactionSpdy21Test, SOCKS4_HTTP_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
@@ -5409,14 +5402,7 @@ TEST_F(HttpNetworkTransactionSpdy21Test, MAYBE_SOCKS4_HTTP_GET) {
   EXPECT_EQ("Payload", response_text);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_SSL_GET DISABLED_SOCKS4_SSL_GET
-#else
-#define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy21Test, MAYBE_SOCKS4_SSL_GET) {
+TEST_F(HttpNetworkTransactionSpdy21Test, SOCKS4_SSL_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("https://www.google.com/");
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index a4bf869..9ba424b 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc
@@ -5351,14 +5351,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BuildRequest_ExtraHeadersStripped) {
   EXPECT_EQ(OK, rv);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_HTTP_GET DISABLED_SOCKS4_HTTP_GET
-#else
-#define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy2Test, MAYBE_SOCKS4_HTTP_GET) {
+TEST_F(HttpNetworkTransactionSpdy2Test, SOCKS4_HTTP_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
@@ -5409,14 +5402,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, MAYBE_SOCKS4_HTTP_GET) {
   EXPECT_EQ("Payload", response_text);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_SSL_GET DISABLED_SOCKS4_SSL_GET
-#else
-#define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy2Test, MAYBE_SOCKS4_SSL_GET) {
+TEST_F(HttpNetworkTransactionSpdy2Test, SOCKS4_SSL_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("https://www.google.com/");
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 57e2179..16aea62 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -5352,14 +5352,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BuildRequest_ExtraHeadersStripped) {
   EXPECT_EQ(OK, rv);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_HTTP_GET DISABLED_SOCKS4_HTTP_GET
-#else
-#define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy3Test, MAYBE_SOCKS4_HTTP_GET) {
+TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS4_HTTP_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
@@ -5410,14 +5403,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, MAYBE_SOCKS4_HTTP_GET) {
   EXPECT_EQ("Payload", response_text);
 }
 
-// http://crbug.com/112682
-#if defined(OS_MACOSX)
-#define MAYBE_SOCKS4_SSL_GET DISABLED_SOCKS4_SSL_GET
-#else
-#define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET
-#endif
-
-TEST_F(HttpNetworkTransactionSpdy3Test, MAYBE_SOCKS4_SSL_GET) {
+TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS4_SSL_GET) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("https://www.google.com/");