Remove dependence on a message loop for net::PathBuilder.

net/cert_net/cert_net_fetcher_impl.h

Index: net/cert_net/cert_net_fetcher_impl.h
diff --git a/net/cert_net/cert_net_fetcher_impl.h b/net/cert_net/cert_net_fetcher_impl.h
index 82f030122ebd51773235d9e93d35cf6e4f516bea..625c52345e1955827a459c2992a5cf35c7e99e88 100644
--- a/net/cert_net/cert_net_fetcher_impl.h
+++ b/net/cert_net/cert_net_fetcher_impl.h
@@ -5,105 +5,23 @@
 #ifndef NET_CERT_NET_CERT_NET_FETCHER_H_
 #define NET_CERT_NET_CERT_NET_FETCHER_H_
 
-#include <map>
 #include <memory>
 
-#include "base/callback.h"
-#include "base/macros.h"
-#include "base/threading/thread_checker.h"
-#include "net/base/net_errors.h"
 #include "net/base/net_export.h"
-#include "net/cert/cert_net_fetcher.h"
 
 namespace net {
 
-class URLRequestContext;
+class CertNetFetcher;
+class URLRequestContextGetter;
 
-// CertNetFetcherImpl is an implementation of CertNetFetcher that uses the
-// network stack.
+// Creates a CertNetFetcher that issues requests through the provided
+// URLRequestContext.
 //
-// For more details refer to the documentation for the interface.
-class NET_EXPORT CertNetFetcherImpl : public CertNetFetcher {
- public:
-  // Initializes CertNetFetcherImpl using the specified URLRequestContext for
-  // issuing requests. |context| must remain valid for the entire lifetime of
-  // the CertNetFetcherImpl.
-  explicit CertNetFetcherImpl(URLRequestContext* context);
-
-  // Deletion implicitly cancels any outstanding requests.
-  ~CertNetFetcherImpl() override;
-
-  WARN_UNUSED_RESULT std::unique_ptr<Request> FetchCaIssuers(
-      const GURL& url,
-      int timeout_milliseconds,
-      int max_response_bytes,
-      const FetchCallback& callback) override;
-
-  WARN_UNUSED_RESULT std::unique_ptr<Request> FetchCrl(
-      const GURL& url,
-      int timeout_milliseconds,
-      int max_response_bytes,
-      const FetchCallback& callback) override;
-
-  WARN_UNUSED_RESULT std::unique_ptr<Request> FetchOcsp(
-      const GURL& url,
-      int timeout_milliseconds,
-      int max_response_bytes,
-      const FetchCallback& callback) override;
-
- private:
-  class RequestImpl;
-  class Job;
-  struct JobToRequestParamsComparator;
-  struct RequestParams;
-
-  struct JobComparator {
-    bool operator()(const Job* job1, const Job* job2) const;
-  };
-
-  // Would be a set<unique_ptr> but extraction of owned objects from a set of
-  // owned types doesn't come until C++17.
-  using JobSet = std::map<Job*, std::unique_ptr<Job>, JobComparator>;
-
-  // Starts an asynchronous request to fetch the given URL. On completion
-  // |callback| will be invoked.
-  //
-  // Completion of the request will never occur synchronously. In other words it
-  // is guaranteed that |callback| will only be invoked once the Fetch*() method
-  // has returned.
-  WARN_UNUSED_RESULT std::unique_ptr<Request> Fetch(
-      std::unique_ptr<RequestParams> request_params,
-      const FetchCallback& callback);
-
-  // Finds a job with a matching RequestPararms or returns nullptr if there was
-  // no match.
-  Job* FindJob(const RequestParams& params);
-
-  // Removes |job| from the in progress jobs and transfers ownership to the
-  // caller.
-  std::unique_ptr<Job> RemoveJob(Job* job);
-
-  // Indicates which Job is currently executing inside of OnJobCompleted().
-  void SetCurrentlyCompletingJob(Job* job);
-  void ClearCurrentlyCompletingJob(Job* job);
-  bool IsCurrentlyCompletingJob(Job* job);
-
-  // The in-progress jobs. This set does not contain the job which is actively
-  // invoking callbacks (OnJobCompleted). Instead that is tracked by
-  // |currently_completing_job_|.
-  JobSet jobs_;
-
-  // The Job that is currently executing OnJobCompleted(). There can be at most
-  // one such job. This pointer is not owned.
-  Job* currently_completing_job_;
-
-  // Not owned. CertNetFetcherImpl must outlive the URLRequestContext.
-  URLRequestContext* context_;
-
-  base::ThreadChecker thread_checker_;
-
-  DISALLOW_COPY_AND_ASSIGN(CertNetFetcherImpl);
-};
+// The returned CertNetFetcher is to be operated on a thread *other* than the
+// thread used for the URLRequestContext (since it gives a blocking interface
+// to URL fetching).
+NET_EXPORT std::unique_ptr<CertNetFetcher> CreateCertNetFetcher(
+    URLRequestContextGetter* context_getter);
 
 }  // namespace net