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

net/cert/internal/path_builder.h

 // Copyright 2016 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.
 
 #ifndef NET_CERT_INTERNAL_PATH_BUILDER_H_
 #define NET_CERT_INTERNAL_PATH_BUILDER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
-#include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/cert/internal/cert_errors.h"
-#include "net/cert/internal/completion_status.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/internal/trust_store.h"
 #include "net/der/input.h"
 #include "net/der/parse_values.h"
 
 namespace net {
 
 namespace der {
 struct GeneralizedTime;
 }
@@ skipping 73 matching lines @@
     // better than invalid, but otherwise nothing is guaranteed.
     size_t best_result_index = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Result);
   };
 
   // TODO(mattm): allow caller specified hook/callback to extend path
   // verification.
   //
+  // TODO(eroman): The assumption is that |result| is default initialized. Can
+  // probably just internalize |result| into CertPathBuilder.
+  //
   // Creates a CertPathBuilder that attempts to find a path from |cert| to a
   // trust anchor in |trust_store|, which satisfies |signature_policy| and is
   // valid at |time|.  Details of attempted path(s) are stored in |*result|.
   //
   // The caller must keep |trust_store|, |signature_policy|, and |*result| valid
   // for the lifetime of the CertPathBuilder.
   CertPathBuilder(scoped_refptr<ParsedCertificate> cert,
                   const TrustStore* trust_store,
                   const SignaturePolicy* signature_policy,
                   const der::GeneralizedTime& time,
                   Result* result);
   ~CertPathBuilder();
 
   // Adds a CertIssuerSource to provide intermediates for use in path building.
   // Multiple sources may be added. Must not be called after Run is called.
   // The |*cert_issuer_source| must remain valid for the lifetime of the
   // CertPathBuilder.
   //
   // (If no issuer sources are added, the target certificate will only verify if
   // it is a trust anchor or is directly signed by a trust anchor.)
   void AddCertIssuerSource(CertIssuerSource* cert_issuer_source);
 
-  // Begins verification of the target certificate.
+  // Executes verification of the target certificate.
   //
-  // If the return value is SYNC then the verification is complete and the
-  // |result| value can be inspected for the status, and |callback| will not be
-  // called.
-  // If the return value is ASYNC, the |callback| will be called asynchronously
-  // once the verification is complete. |result| should not be examined or
-  // modified until the |callback| is run.
-  //
-  // If |callback| is null, verification always completes synchronously, even if
-  // it fails to find a valid path and one could have been found asynchronously.
-  //
-  // The CertPathBuilder may be deleted while an ASYNC verification is pending,
-  // in which case the verification is cancelled, |callback| will not be called,
-  // and the output Result will be in an undefined state.
-  // It is safe to delete the CertPathBuilder during the |callback|.
-  // Run must not be called more than once on each CertPathBuilder instance.
-  CompletionStatus Run(const base::Closure& callback);
+  // Upon return results are written to the |result| object passed into the
+  // constructor. Run must not be called more than once on each CertPathBuilder
+  // instance.
+  void Run();
 
  private:
   enum State {
     STATE_NONE,
     STATE_GET_NEXT_PATH,
     STATE_GET_NEXT_PATH_COMPLETE,
   };
 
-  CompletionStatus DoLoop(bool allow_async);
-
-  CompletionStatus DoGetNextPath(bool allow_async);
-  void HandleGotNextPath();
-  CompletionStatus DoGetNextPathComplete();
+  void DoGetNextPath();
+  void DoGetNextPathComplete();
 
   void AddResultPath(std::unique_ptr<ResultPath> result_path);
 
-  base::Closure callback_;
-
   std::unique_ptr<CertPathIter> cert_path_iter_;
   const SignaturePolicy* signature_policy_;
   const der::GeneralizedTime time_;
 
   // Stores the next complete path to attempt verification on. This is filled in
   // by |cert_path_iter_| during the STATE_GET_NEXT_PATH step, and thus should
   // only be accessed during the STATE_GET_NEXT_PATH_COMPLETE step.
   // (Will be empty if all paths have been tried, otherwise will be a candidate
   // path starting with the target cert and ending with a
   // certificate issued by trust anchor.)
   CertPath next_path_;
   State next_state_;
 
   Result* out_result_;
 
   DISALLOW_COPY_AND_ASSIGN(CertPathBuilder);
 };
 
 }  // namespace net
 
 #endif  // NET_CERT_INTERNAL_PATH_BUILDER_H_