Revert 89628 - Revert 89489 - net: don't check revocation when fetching PAC files.

net/proxy/proxy_script_fetcher_impl_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_script_fetcher_impl.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
 #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"
 #include "net/http/http_cache.h"
 #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"
 
 namespace net {
 
 // TODO(eroman):
 //   - Test canceling an outstanding request.
 //   - Test deleting ProxyScriptFetcher while a request is in progress.
 
 namespace {
 
 const FilePath::CharType kDocRoot[] =
     FILE_PATH_LITERAL("net/data/proxy_script_fetcher_unittest");
 
 struct FetchResult {
   int code;
   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:
   RequestContext() : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
     ProxyConfig no_proxy;
     storage_.set_host_resolver(
         CreateSystemHostResolver(HostResolver::kDefaultParallelism,
                                  HostResolver::kDefaultRetryAttempts,
                                  NULL));
     storage_.set_cert_verifier(new CertVerifier);
     storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy));
     storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
 
     HttpNetworkSession::Params params;
     params.host_resolver = host_resolver();
     params.cert_verifier = cert_verifier();
     params.proxy_service = proxy_service();
     params.ssl_config_service = ssl_config_service();
     scoped_refptr<HttpNetworkSession> network_session(
         new HttpNetworkSession(params));
     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:
   ~RequestContext() {
   }
 
   URLRequestContextStorage storage_;
+  scoped_ptr<URLRequestJobFactory> url_request_job_factory_;
 };
 
 // Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest.
 GURL GetTestFileUrl(const std::string& relpath) {
   FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("proxy_script_fetcher_unittest");
   GURL base_url = FilePathToFileURL(path);
@@ skipping 293 matching lines @@
   {
     GURL url(kEncodedUrlBroken);
     string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher.Fetch(url, &text, &callback);
     EXPECT_EQ(ERR_FAILED, result);
   }
 }
 
 }  // namespace net