Re-enable some network tests that have been disabled for

over a year due to failures with Chrome Frame.  Keep them
disabled for Chrome Frame tests.

Also disable two of them on Android.

BUG=102991
Review URL: https://codereview.chromium.org/12042058

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

3 files changed, 11 insertions, 9 deletions

diff --git a/build/android/pylib/gtest/filter/net_unittests_disabled b/build/android/pylib/gtest/filter/net_unittests_disabled
index 95b465b..b636581 100644
--- a/build/android/pylib/gtest/filter/net_unittests_disabled
+++ b/build/android/pylib/gtest/filter/net_unittests_disabled
@@ -7,6 +7,7 @@ CertVerifyProcTest.VerifyReturnChainProperlyOrdered
 HTTPSCRLSetTest.ExpiredCRLSet
 HTTPSEVCRLSetTest.FreshCRLSet
 HTTPSRequestTest.ClientAuthTest
+HTTPSRequestTest.HTTPSGetTest
 HTTPSRequestTest.ResumeTest
 HTTPSRequestTest.SSLSessionCacheShardTest
 # Bug: 171812
@@ -15,6 +16,7 @@ MultiThreadedCertVerifierTest.CancelRequest
 PythonUtils.PythonRunTime
 TransportSecurityStateTest.ValidPinsHeadersSHA1
 TransportSecurityStateTest.ValidPinsHeadersSHA256
+URLRequestTestHTTP.HTTPSToHTTPRedirectNoRefererTest
 URLRequestTestHTTP.ProcessSTS
 URLRequestTestHTTP.ProcessSTSOnce
 VerifyEndEntity/CertVerifyProcWeakDigestTest.Verify/0
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 21a0b34..97adf3f 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -205,6 +205,11 @@ void FilterDisabledTests() {
     "HTTPSRequestTest.HTTPSExpiredTest",
     "HTTPSRequestTest.ClientAuthTest",
 
+    // More HTTPS tests failing due to certificate dialogs.
+    // http://crbug.com/102991
+    "URLRequestTestHTTP.HTTPSToHTTPRedirectNoRefererTest",
+    "HTTPSRequestTest.HTTPSGetTest",
+
     // Tests chrome's network stack's cache (might not apply to CF).
     "URLRequestTestHTTP.VaryHeader",
     "URLRequestTestHTTP.GetZippedTest",
@@ -269,6 +274,7 @@ void FilterDisabledTests() {
     // These tests are disabled as they rely on functionality provided by
     // Chrome's HTTP stack like the ability to set the proxy for a URL, etc.
     "URLRequestTestHTTP.ProxyTunnelRedirectTest",
+    "URLRequestTestHTTP.NetworkDelegateTunnelConnectionFailed",
     "URLRequestTestHTTP.UnexpectedServerAuthTest",
 
     // These tests are disabled as they expect an empty UA to be echoed back
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4f223e5..eec3aa5 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2131,9 +2131,7 @@ TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) {
 
 // This is the same as the previous test, but checks that the network delegate
 // registers the error.
-// This test was disabled because it made chrome_frame_net_tests hang
-// (see bug 102991).
-TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateTunnelConnectionFailed) {
+TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) {
   ASSERT_TRUE(test_server_.Start());
 
   TestNetworkDelegate network_delegate;  // Must outlive URLRequest.
@@ -2942,9 +2940,7 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) {
   }
 }
 
-// This test was disabled because it made chrome_frame_net_tests hang
-// (see bug 102991).
-TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) {
+TEST_F(URLRequestTestHTTP, HTTPSToHTTPRedirectNoRefererTest) {
   ASSERT_TRUE(test_server_.Start());
 
   TestServer https_test_server(
@@ -4141,9 +4137,7 @@ class HTTPSRequestTest : public testing::Test {
   TestURLRequestContext default_context_;
 };
 
-// This test was disabled because it made chrome_frame_net_tests hang
-// (see bug 102991).
-TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) {
+TEST_F(HTTPSRequestTest, HTTPSGetTest) {
   TestServer test_server(TestServer::TYPE_HTTPS,
                          TestServer::kLocalhost,
                          base::FilePath(FILE_PATH_LITERAL("net/data/ssl")));