Revert 128414 - Disable OCSP tests on Android

The OCSP test server works now. (fixed by http://src.chromium.org/viewvc/chrome?view=rev&revision=133704)

The on-demand OCSP test server is not supported on Android. Disable
these tests.

BUG=119642
TEST=green bots


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

TBR=rsleevi@chromium.org

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

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

net/test/remote_test_server.cc

@@ -82,12 +82,6 @@ bool RemoteTestServer::Start() {
   if (!GenerateArguments(&arguments_dict))
     return false;
 
-  if (arguments_dict.HasKey("ocsp")) {
-    NOTIMPLEMENTED() << "OCSP on-demand generation is not supported. "
-                     << "See http://crbug.com/119642.";
-    return false;
-  }
-
   // Append the 'server-type' argument which is used by spawner server to
   // pass right server type to Python test server.
   arguments_dict.SetString("server-type", GetServerTypeString(type()));

net/url_request/url_request_unittest.cc

@@ -1411,10 +1411,6 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) {
   }
 }
 
-// Disabled on Android - http://crbug.com/119642 - The Android test server
-// does not support generating OCSP responses on the fly.
-#if !defined(OS_ANDROID)
-
 class TestSSLConfigService : public SSLConfigService {
  public:
   TestSSLConfigService(bool ev_enabled, bool online_rev_checking)
@@ -1730,8 +1726,6 @@ TEST_F(HTTPSCRLSetTest, ExpiredCRLSet) {
   EXPECT_FALSE(cert_status & CERT_STATUS_REV_CHECKING_ENABLED);
 }
 
-#endif  // !defined(OS_ANDROID)
-
 // This tests that a load of www.google.com with a certificate error sets
 // the |certificate_errors_are_fatal| flag correctly. This flag will cause
 // the interstitial to be fatal.