Tunnel PWGRasterConfig capability to the ticket and to the utility process

chrome/browser/local_discovery/pwg_raster_converter.cc

 // 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.
 
 #include "chrome/browser/local_discovery/pwg_raster_converter.h"
 
 #include "base/bind_helpers.h"
 #include "base/cancelable_callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 90 matching lines @@
 // 3. Start utility process and start conversion on the IO thread.
 // 4. Run result callback on the UI thread.
 // 5. Instance is destroyed from any thread that has the last reference.
 // 6. FileHandlers destroyed on the FILE thread.
 //    This step posts |FileHandlers| to be destroyed on the FILE thread.
 // All these steps work sequentially, so no data should be accessed
 // simultaneously by several threads.
 class PwgUtilityProcessHostClient : public content::UtilityProcessHostClient {
  public:
   explicit PwgUtilityProcessHostClient(
-      const printing::PdfRenderSettings& settings);
+      const printing::PdfRenderSettings& settings,
+      const printing::PwgRasterSettings& bitmap_settings);
 
   void Convert(base::RefCountedMemory* data,
                const PWGRasterConverter::ResultCallback& callback);
 
   // UtilityProcessHostClient implementation.
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   virtual ~PwgUtilityProcessHostClient();
 
   // Message handlers.
   void OnProcessStarted();
   void OnSucceeded();
   void OnFailed();
 
   void RunCallback(bool success);
 
   void StartProcessOnIOThread();
 
   void RunCallbackOnUIThread(bool success);
   void OnFilesReadyOnUIThread();
 
   scoped_ptr<FileHandlers> files_;
   printing::PdfRenderSettings settings_;
+  printing::PwgRasterSettings bitmap_settings_;
   PWGRasterConverter::ResultCallback callback_;
   base::WeakPtr<content::UtilityProcessHost> utility_process_host_;
 
   DISALLOW_COPY_AND_ASSIGN(PwgUtilityProcessHostClient);
 };
 
 PwgUtilityProcessHostClient::PwgUtilityProcessHostClient(
-    const printing::PdfRenderSettings& settings) : settings_(settings) {
-}
+    const printing::PdfRenderSettings& settings,
+    const printing::PwgRasterSettings& bitmap_settings)
+    : settings_(settings), bitmap_settings_(bitmap_settings) {}
 
 PwgUtilityProcessHostClient::~PwgUtilityProcessHostClient() {
   // Delete temp directory.
   BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE, files_.release());
 }
 
 void PwgUtilityProcessHostClient::Convert(
     base::RefCountedMemory* data,
     const PWGRasterConverter::ResultCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 26 matching lines @@
 }
 
 void PwgUtilityProcessHostClient::OnProcessStarted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!utility_process_host_) {
     RunCallbackOnUIThread(false);
     return;
   }
 
   base::ProcessHandle process = utility_process_host_->GetData().handle;
-  utility_process_host_->Send(
-      new ChromeUtilityMsg_RenderPDFPagesToPWGRaster(
-          files_->GetPdfForProcess(process),
-          settings_,
-          files_->GetPwgForProcess(process)));
+  utility_process_host_->Send(new ChromeUtilityMsg_RenderPDFPagesToPWGRaster(
+      files_->GetPdfForProcess(process),
+      settings_,
+      bitmap_settings_,
+      files_->GetPwgForProcess(process)));
   utility_process_host_.reset();
 }
 
 void PwgUtilityProcessHostClient::OnSucceeded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunCallback(true);
 }
 
 void PwgUtilityProcessHostClient::OnFailed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 38 matching lines @@
 }
 
 class PWGRasterConverterImpl : public PWGRasterConverter {
  public:
   PWGRasterConverterImpl();
 
   virtual ~PWGRasterConverterImpl();
 
   virtual void Start(base::RefCountedMemory* data,
                      const printing::PdfRenderSettings& conversion_settings,
+                     const printing::PwgRasterSettings& bitmap_settings,
                      const ResultCallback& callback) OVERRIDE;
+
  private:
   scoped_refptr<PwgUtilityProcessHostClient> utility_client_;
   base::CancelableCallback<ResultCallback::RunType> callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PWGRasterConverterImpl);
 };
 
 PWGRasterConverterImpl::PWGRasterConverterImpl() {
 }
 
 PWGRasterConverterImpl::~PWGRasterConverterImpl() {
 }
 
 void PWGRasterConverterImpl::Start(
     base::RefCountedMemory* data,
     const printing::PdfRenderSettings& conversion_settings,
+    const printing::PwgRasterSettings& bitmap_settings,
     const ResultCallback& callback) {
   // Rebind cancelable callback to avoid calling callback if
   // PWGRasterConverterImpl is destroyed.
   callback_.Reset(callback);
-  utility_client_ = new PwgUtilityProcessHostClient(conversion_settings);
+  utility_client_ =
+      new PwgUtilityProcessHostClient(conversion_settings, bitmap_settings);
   utility_client_->Convert(data, callback_.callback());
 }
 
 }  // namespace
 
 // static
 scoped_ptr<PWGRasterConverter> PWGRasterConverter::CreateDefault() {
   return scoped_ptr<PWGRasterConverter>(new PWGRasterConverterImpl());
 }
 
 }  // namespace local_discovery