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

net/cert/internal/trust_store_collection.h

Index: net/cert/internal/trust_store_collection.h
diff --git a/net/cert/internal/trust_store_collection.h b/net/cert/internal/trust_store_collection.h
index ec9d49fd8e28b085dd242deb1410fbcf6ff1ebb3..464c210df5f4478d8df25951d60a19da657b2af4 100644
--- a/net/cert/internal/trust_store_collection.h
+++ b/net/cert/internal/trust_store_collection.h
@@ -18,41 +18,23 @@ namespace net {
 // TrustStoreCollection is an implementation of TrustStore which combines the
 // results from multiple TrustStores.
 //
-// The synchronous matches will be in order from the primary store, and then
-// from the secondary stores in the order they were added to the
-// TrustStoreCollection.
-//
-// Currently only one "primary" store can be added that supports async queries,
-// any number of additional, synchronous-only stores can be used. (The
-// assumption is that the async one would be useful for OS integration, while
-// the sync only stores can be used for supplying additional anchors. If
-// multiple async stores are desired, it might be worth changing the
-// FindTrustAnchorsForCert interface so that it can return async results in
-// multiple batches.)
+// The order of the matches will correspond to a concatenation of matches in
+// the order the stores were added.
 class NET_EXPORT TrustStoreCollection : public TrustStore {
  public:
   TrustStoreCollection();
   ~TrustStoreCollection() override;
 
-  // Includes results from |store| in the combined output. Both sync and async
-  // queries to |store| will be allowed. |store| must outlive the
-  // TrustStoreCollection.
-  void SetPrimaryTrustStore(TrustStore* store);
-
-  // Includes results from |store| in the combined output. |store| will only be
-  // queried synchronously. |store| must outlive the TrustStoreCollection.
-  void AddTrustStoreSynchronousOnly(TrustStore* store);
+  // Includes results from |store| in the combined output. |store| must
+  // outlive the TrustStoreCollection.
+  void AddTrustStore(TrustStore* store);
 
   // TrustStore implementation:
-  void FindTrustAnchorsForCert(
-      const scoped_refptr<ParsedCertificate>& cert,
-      const TrustAnchorsCallback& callback,
-      TrustAnchors* synchronous_matches,
-      std::unique_ptr<Request>* out_req) const override;
+  void FindTrustAnchorsForCert(const scoped_refptr<ParsedCertificate>& cert,
+                               TrustAnchors* matches) const override;
 
  private:
-  TrustStore* primary_store_ = nullptr;
-  std::vector<TrustStore*> sync_only_stores_;
+  std::vector<TrustStore*> stores_;
 
   DISALLOW_COPY_AND_ASSIGN(TrustStoreCollection);
 };