Update PpdProvider threading model.

chromeos/printing/ppd_provider.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 CHROMEOS_PRINTING_PPD_PROVIDER_H_
 #define CHROMEOS_PRINTING_PPD_PROVIDER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/sequenced_task_runner.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/printing/printer_configuration.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace chromeos {
 namespace printing {
 
@@ skipping 43 matching lines @@
 
     // hostname of quirks server to query.
     std::string quirks_server = "chromeosquirksserver-pa.googleapis.com";
 
     // Maximum size of the contents of a PPD file, in bytes.  Trying to use a
     // PPD file bigger than this will cause INTERNAL_ERRORs at resolution time.
     size_t max_ppd_contents_size_ = 100 * 1024;
   };
 
   // Create and return a new PpdProvider with the given cache and options.
+  // |io_task_runner| is used to run operations that are long latency and should
+  // not be on the UI thread.  References to |url_context_getter| and
+  // |io_task_runner| are taken.
   static std::unique_ptr<PpdProvider> Create(
       const std::string& api_key,
       scoped_refptr<net::URLRequestContextGetter> url_context_getter,
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
       std::unique_ptr<PpdCache> cache,
       const Options& options = Options());
 
   virtual ~PpdProvider() {}
 
   // Given a PpdReference, attempt to resolve the PPD for printing.
   //
   // Must be called from a Sequenced Task context (i.e.
   // base::SequencedTaskRunnerHandle::IsSet() must be true).
   //
   // |cb| will only be called after the task invoking Resolve() is finished.
   //
   // Only one Resolve() call should be outstanding at a time.

[stevenjb, 2016/11/14 23:08:39]

s/should be/may be/

   virtual void Resolve(const Printer::PpdReference& ppd_reference,
                        const ResolveCallback& cb) = 0;
 
-  // Abort any outstanding Resolve() call.  After this returns, it is guaranteed
-  // that no ResolveCallback will be called until the next time Resolve is
-  // called.  It is a nop to call this if no Resolve() is outstanding.
-  virtual void AbortResolve() = 0;
-
   // Get all the printer makes and models we can support.
   //
   // Must be called from a Sequenced Task context (i.e.
   // base::SequencedTaskRunnerHandle::IsSet() must be true).
   //
   // |cb| will only be called after the task invoking QueryAvailable() is
   // finished.
   //
   // Only one QueryAvailable() call should be outstanding at a time.

[stevenjb, 2016/11/14 23:08:39]

s/should be/may be/

[Carlson, 2016/11/14 23:27:41]

Done.

   virtual void QueryAvailable(const QueryAvailableCallback& cb) = 0;
 
-  // Abort any outstanding QueryAvailable() call.  After this returns, it is
-  // guaranteed that no QueryAvailableCallback will be called until the next
-  // time QueryAvailable() is called.  It is a nop to call this if no
-  // QueryAvailable() is outstanding.
-  virtual void AbortQueryAvailable() = 0;
-
   // Most of the time, the cache is just an invisible backend to the Provider,
   // consulted at Resolve time, but in the case of the user doing "Add Printer"
   // and "Select PPD" locally, then we get into a state where we want to put
   // whatever they give us directly into the cache without doing a resolve.
   // This hook lets is do that.
   virtual bool CachePpd(const Printer::PpdReference& ppd_reference,
                         const base::FilePath& ppd_path) = 0;
 };
 
 }  // namespace printing
 }  // namespace chromeos
 
 #endif  // CHROMEOS_PRINTING_PPD_PROVIDER_H_