4 files changed, 4 insertions, 39 deletions
diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
index 242a3de..364ef94 100644
--- a/net/base/load_flags_list.h
+++ b/net/base/load_flags_list.h
@@ -51,9 +51,9 @@ LOAD_FLAG(IGNORE_CERT_DATE_INVALID, 1 << 9)
 // (The default behavior is to trigger an OnSSLCertificateError callback).
 LOAD_FLAG(IGNORE_CERT_AUTHORITY_INVALID, 1 << 10)
 
-// If present, causes certificate revocation checks to be skipped on secure
-// connections.
-LOAD_FLAG(DISABLE_CERT_REVOCATION_CHECKING, 1 << 11)
+// If present, ignores certificate revocation
+// (The default behavior is to trigger an OnSSLCertificateError callback).
+LOAD_FLAG(IGNORE_CERT_REVOCATION, 1 << 11)
 
 // If present, ignores wrong key usage of the certificate
 // (The default behavior is to trigger an OnSSLCertificateError callback).
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 8b06a3b..9054346 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -162,9 +162,6 @@ int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
   request_ = request_info;
   start_time_ = base::Time::Now();
 
-  if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING)
-    ssl_config_.rev_checking_enabled = false;
-
   next_state_ = STATE_CREATE_STREAM;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc
index d0b9d6a..c276c30 100644
--- a/net/proxy/proxy_script_fetcher_impl.cc
+++ b/net/proxy/proxy_script_fetcher_impl.cc
@@ -145,12 +145,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url,
   // Also disable the use of the disk cache. The cache is disabled so that if
   // the user switches networks we don't potentially use the cached response
   // from old network when we should in fact be re-fetching on the new network.
-  // If the PAC script is hosted on an HTTPS server we bypass revocation
-  // checking in order to avoid a circular dependency when attempting to fetch
-  // the OCSP response or CRL. We could make the revocation check go direct but
-  // the proxy might be the only way to the outside world.
-  cur_request_->set_load_flags(LOAD_BYPASS_PROXY | LOAD_DISABLE_CACHE |
-                               LOAD_DISABLE_CERT_REVOCATION_CHECKING);
+  cur_request_->set_load_flags(LOAD_BYPASS_PROXY | LOAD_DISABLE_CACHE);
 
   // Save the caller's info for notification on completion.
   callback_ = callback;
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index f7bf5ef..98fbd5e 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -11,7 +11,6 @@
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
-#include "net/base/load_flags.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
@@ -19,7 +18,6 @@
 #include "net/http/http_network_session.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_context_storage.h"
-#include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -40,26 +38,6 @@ struct FetchResult {
   string16 text;
 };
 
-// CheckNoRevocationFlagSetInterceptor causes a test failure if a request is
-// seen that doesn't set a load flag to bypass revocation checking.
-class CheckNoRevocationFlagSetInterceptor :
-    public URLRequestJobFactory::Interceptor {
- public:
-  virtual URLRequestJob* MaybeIntercept(URLRequest* request) const OVERRIDE {
-    EXPECT_TRUE(request->load_flags() & LOAD_DISABLE_CERT_REVOCATION_CHECKING);
-    return NULL;
-  }
-
-  virtual URLRequestJob* MaybeInterceptRedirect(const GURL& location,
-                                                URLRequest* request) const {
-    return NULL;
-  }
-
-  virtual URLRequestJob* MaybeInterceptResponse(URLRequest* request) const {
-    return NULL;
-  }
-};
-
 // A non-mock URL request which can access http:// and file:// urls.
 class RequestContext : public URLRequestContext {
  public:
@@ -83,10 +61,6 @@ class RequestContext : public URLRequestContext {
     storage_.set_http_transaction_factory(new HttpCache(
         network_session,
         HttpCache::DefaultBackend::InMemory(0)));
-    url_request_job_factory_.reset(new URLRequestJobFactory);
-    set_job_factory(url_request_job_factory_.get());
-    url_request_job_factory_->AddInterceptor(
-        new CheckNoRevocationFlagSetInterceptor);
   }
 
  private:
@@ -94,7 +68,6 @@ class RequestContext : public URLRequestContext {
   }
 
   URLRequestContextStorage storage_;
-  scoped_ptr<URLRequestJobFactory> url_request_job_factory_;
 };
 
 // Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest.