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

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

If a job fails to print due to an invalid document type when printing a PDF,
request a PWG raster instead.

BUG=318373
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235693

[gene, 2013-11-14 00:44:22]

lgtm

[Vitaly Buka (NO REVIEWS), 2013-11-14 08:28:56]

lgtm

[commit-bot: I haz the power, 2013-11-14 19:05:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/61643021/1

[commit-bot: I haz the power, 2013-11-14 19:05:14]

Failed to apply patch for chrome/browser/local_discovery/privet_http_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/local_discovery/privet_http_impl.cc
  Hunk #1 succeeded at 534 (offset -14 lines).
  Hunk #2 succeeded at 552 (offset -16 lines).
  Hunk #3 succeeded at 562 (offset -16 lines).
  Hunk #4 FAILED at 660.
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/local_discovery/privet_http_impl.cc.rej

Patch:       chrome/browser/local_discovery/privet_http_impl.cc
Index: chrome/browser/local_discovery/privet_http_impl.cc
diff --git a/chrome/browser/local_discovery/privet_http_impl.cc
b/chrome/browser/local_discovery/privet_http_impl.cc
index
af5fba17835d658058bab6d3dab4a711c6bacf6b..f9ba59e56d543194c40f977e4b6301cf2dc4ff50
100644
--- a/chrome/browser/local_discovery/privet_http_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_impl.cc
@@ -548,9 +548,8 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
   // 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_++;
@@ -569,6 +568,9 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
           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);
     }
@@ -576,7 +578,6 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
     return;
   }
 
-
   // If we've gotten this far, there are no errors, so we've effectively
   // succeeded.
   delegate_->OnPrivetPrintingDone(this);
@@ -659,7 +660,7 @@ void PrivetLocalPrintOperationImpl::SetOffline(bool offline)
{
 }
 
 void PrivetLocalPrintOperationImpl::SendDataInternal() {
-  if (has_extended_workflow_ && !ticket_.empty()) {
+  if (has_extended_workflow_ && !ticket_.empty() && jobid_.empty()) {
     DoCreatejob();
   } else {
     DoSubmitdoc();

[commit-bot: I haz the power, 2013-11-15 20:53:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/61643021/1

[commit-bot: I haz the power, 2013-11-15 20:53:44]

Failed to apply patch for chrome/browser/local_discovery/privet_http_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/local_discovery/privet_http_impl.cc
  Hunk #1 succeeded at 536 (offset -12 lines).
  Hunk #2 succeeded at 554 (offset -14 lines).
  Hunk #3 succeeded at 564 (offset -14 lines).
  Hunk #4 FAILED at 660.
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/local_discovery/privet_http_impl.cc.rej

Patch:       chrome/browser/local_discovery/privet_http_impl.cc
Index: chrome/browser/local_discovery/privet_http_impl.cc
diff --git a/chrome/browser/local_discovery/privet_http_impl.cc
b/chrome/browser/local_discovery/privet_http_impl.cc
index
af5fba17835d658058bab6d3dab4a711c6bacf6b..f9ba59e56d543194c40f977e4b6301cf2dc4ff50
100644
--- a/chrome/browser/local_discovery/privet_http_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_impl.cc
@@ -548,9 +548,8 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
   // 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_++;
@@ -569,6 +568,9 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
           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);
     }
@@ -576,7 +578,6 @@ void PrivetLocalPrintOperationImpl::OnSubmitdocResponse(
     return;
   }
 
-
   // If we've gotten this far, there are no errors, so we've effectively
   // succeeded.
   delegate_->OnPrivetPrintingDone(this);
@@ -659,7 +660,7 @@ void PrivetLocalPrintOperationImpl::SetOffline(bool offline)
{
 }
 
 void PrivetLocalPrintOperationImpl::SendDataInternal() {
-  if (has_extended_workflow_ && !ticket_.empty()) {
+  if (has_extended_workflow_ && !ticket_.empty() && jobid_.empty()) {
     DoCreatejob();
   } else {
     DoSubmitdoc();

[commit-bot: I haz the power, 2013-11-18 08:22:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/61643021/1

[commit-bot: I haz the power, 2013-11-18 08:23:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/61643021/1

[commit-bot: I haz the power, 2013-11-18 11:05:18]

Change committed as 235693