Move PDF to PWG conversion into PrivetLocalPrintOperationImpl

chrome/browser/local_discovery/privet_http.h

 // Copyright 2013 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 CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_HTTP_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_HTTP_H_
 
 #include <string>
 
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/local_discovery/privet_url_fetcher.h"
+#include "chrome/browser/local_discovery/pwg_raster_converter.h"
 #include "net/base/host_port_pair.h"
 
 namespace local_discovery {
 
 class PrivetHTTPClient;
 
 // Represents a request to /privet/info. Will store a cached response and token
 // in the PrivetHTTPClient that created.
 class PrivetInfoOperation {
  public:
@@ skipping 87 matching lines @@
   virtual void Start() = 0;
 
   virtual PrivetHTTPClient* GetHTTPClient() = 0;
 };
 
 class PrivetLocalPrintOperation {
  public:
   class Delegate {
    public:
     virtual ~Delegate() {}
-    virtual void OnPrivetPrintingRequestPDF(
-        const PrivetLocalPrintOperation* print_operation) = 0;
-    virtual void OnPrivetPrintingRequestPWGRaster(
-        const PrivetLocalPrintOperation* print_operation) = 0;
     virtual void OnPrivetPrintingDone(
         const PrivetLocalPrintOperation* print_operation) = 0;
     virtual void OnPrivetPrintingError(
         const PrivetLocalPrintOperation* print_operation, int http_code) = 0;
   };
 
   virtual ~PrivetLocalPrintOperation() {}
 
   virtual void Start() = 0;
 
-  // One of thsese should be called ONLY after |OnPrivetPrintingRequestPDF| or
-  // |OnPrivetPrintingRequestPWGRaster| are called on the delegate.  Data should
-  // be in PDF or PWG format depending on what is requested by the local print
-  // operation.
-  virtual void SendData(const std::string& data) = 0;
-  virtual void SendDataFile(const base::FilePath& data) = 0;
+
+  // Required print data. MUST be called before calling |Start()|.
+  virtual void SetData(scoped_refptr<base::RefCountedBytes> data) = 0;

[Vitaly Buka (NO REVIEWS), 2013/11/15 06:48:38]

just base::RefCountedBytes*

[Noam Samuel, 2013/11/15 19:13:46]

Done.

 
   // Optional attributes for /submitdoc. Call before calling |Start()|
   // |ticket| should be in CJT format.
   virtual void SetTicket(const std::string& ticket) = 0;
   // Username and jobname are for display only.
   virtual void SetUsername(const std::string& username) = 0;
   virtual void SetJobname(const std::string& jobname) = 0;
   // If |offline| is true, we will indicate to the printer not to post the job
   // to Google Cloud Print.
   virtual void SetOffline(bool offline) = 0;
 
+  // For testing, inject an alternative PWG raster converter.
+  virtual void SetPWGRasterConverterForTesting(
+      scoped_ptr<PWGRasterConverter> pwg_raster_converter) = 0;
+

[Vitaly Buka (NO REVIEWS), 2013/11/15 06:48:38]

same

[Noam Samuel, 2013/11/15 19:13:46]

Using a scoped_ptr denotes the transfer of ownership, so I feel it's
semantically useful. Unless you think pwg_raster_converter should be
ref-counted?

   virtual PrivetHTTPClient* GetHTTPClient() = 0;
 };
 
 // Privet HTTP client. Must not outlive the operations it creates.
 class PrivetHTTPClient {
  public:
   virtual ~PrivetHTTPClient() {}
   virtual const base::DictionaryValue* GetCachedInfo() const = 0;
 
   virtual scoped_ptr<PrivetRegisterOperation> CreateRegisterOperation(
       const std::string& user,
       PrivetRegisterOperation::Delegate* delegate) = 0;
   virtual scoped_ptr<PrivetInfoOperation> CreateInfoOperation(
       PrivetInfoOperation::Delegate* delegate) = 0;
   virtual scoped_ptr<PrivetCapabilitiesOperation> CreateCapabilitiesOperation(
       PrivetCapabilitiesOperation::Delegate* delegate) = 0;
   virtual scoped_ptr<PrivetLocalPrintOperation> CreateLocalPrintOperation(
       PrivetLocalPrintOperation::Delegate* delegate) = 0;
 
   // A name for the HTTP client, e.g. the device name for the privet device.
   virtual const std::string& GetName() = 0;
 };
 
 }  // namespace local_discovery
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_HTTP_H_