If a job fails when sending a PDF, retry with a PWG raster

chrome/browser/local_discovery/privet_http_impl.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/privet_http_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 530 matching lines @@
     delegate_->OnPrivetPrintingRequestPWGRaster(this);
 }
 
 void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
     bool has_error,
     const base::DictionaryValue* value) {
   std::string error;
   // This error is only relevant in the case of extended workflow:
   // If the print job ID is invalid, retry createjob and submitdoc,
   // rather than simply retrying the current request.
-  if (has_error) {
+  if (has_error && value->GetString(kPrivetKeyError, &error)) {
     if (has_extended_workflow_ &&
-        value->GetString(kPrivetKeyError, &error) &&
         error == kPrivetErrorInvalidPrintJob &&
         invalid_job_retries_ < kPrivetLocalPrintMaxRetries) {
       invalid_job_retries_++;
 
       int timeout = kPrivetLocalPrintDefaultTimeout;
       value->GetInteger(kPrivetKeyTimeout, &timeout);
 
       double random_scaling_factor =
           1 + base::RandDouble() * kPrivetMaximumTimeRandomAddition;
 
       timeout = static_cast<int>(timeout * random_scaling_factor);
 
       timeout = std::max(timeout, kPrivetMinimumTimeout);
 
       base::MessageLoop::current()->PostDelayedTask(
           FROM_HERE, base::Bind(&PrivetLocalPrintOperationImpl::DoCreatejob,
                                 weak_factory_.GetWeakPtr()),
           base::TimeDelta::FromSeconds(timeout));
+    } else if (use_pdf_ && error == kPrivetErrorInvalidDocumentType) {
+      use_pdf_ = false;
+      delegate_->OnPrivetPrintingRequestPWGRaster(this);
     } else {
       delegate_->OnPrivetPrintingError(this, 200);
     }
 
     return;
   }
 
-
   // If we've gotten this far, there are no errors, so we've effectively
   // succeeded.
   delegate_->OnPrivetPrintingDone(this);
 }
 
 void PrivetLocalPrintOperationImpl::OnCreatejobResponse(
     bool has_error,
     const base::DictionaryValue* value) {
   if (has_error) {
     delegate_->OnPrivetPrintingError(this, 200);
@@ skipping 62 matching lines @@
   DCHECK(!started_);
   jobname_ = jobname;
 }
 
 void PrivetLocalPrintOperationImpl::SetOffline(bool offline) {
   DCHECK(!started_);
   offline_ = offline;
 }
 
 void PrivetLocalPrintOperationImpl::SendDataInternal() {
-  if (has_extended_workflow_ && !ticket_.empty()) {
+  if (has_extended_workflow_ && !ticket_.empty() && jobid_.empty()) {
     DoCreatejob();
   } else {
     DoSubmitdoc();
   }
 }
 
 PrivetHTTPClientImpl::PrivetHTTPClientImpl(
     const std::string& name,
     const net::HostPortPair& host_port,
     net::URLRequestContextGetter* request_context)
@@ skipping 91 matching lines @@
   TokenCallbackVector token_callbacks;
   token_callbacks_.swap(token_callbacks);
 
   for (TokenCallbackVector::iterator i = token_callbacks.begin();
        i != token_callbacks.end(); i++) {
     i->Run(token);
   }
 }
 
 }  // namespace local_discovery