Merge 145341 - Do not add 'cloudPrintID' in print preview settings, if the print destination is loc…

chrome/browser/resources/print_preview/native_layer.js

 // Copyright (c) 2012 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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * An interface to the native Chromium printing system layer.
    * @constructor
@@ skipping 131 matching lines @@
         'marginsType': printTicketStore.getMarginsType(),
         'isFirstRequest': requestId == 0,
         'requestID': requestId,
         'previewModifiable': printTicketStore.isDocumentModifiable,
         'printToPDF':
             destination != null &&
             destination.id ==
                 print_preview.Destination.GooglePromotedId.SAVE_AS_PDF,
         'printWithCloudPrint': destination != null && !destination.isLocal,
         'deviceName': destination == null ? 'foo' : destination.id,
-        'cloudPrintID': destination == null ? 'foo' : destination.id,
         'generateDraftData': printTicketStore.isDocumentModifiable,
         'fitToPageEnabled': printTicketStore.isFitToPageEnabled(),
 
         // NOTE: Even though the following fields don't directly relate to the
         // preview, they still need to be included.
         'duplex': printTicketStore.isDuplexEnabled() ?
             NativeLayer.DuplexMode.LONG_EDGE : NativeLayer.DuplexMode.SIMPLEX,
         'copies': printTicketStore.getCopies(),
         'collate': printTicketStore.isCollateEnabled()
       };
 
+      // Set 'cloudPrintID' only if the destination is not local.
+      if (!destination.isLocal)
+        ticket['cloudPrintID'] = destination.id;
+
       if (printTicketStore.hasMarginsCapability() &&
           printTicketStore.getMarginsType() ==
               print_preview.ticket_items.MarginsType.Value.CUSTOM) {
         var customMargins = printTicketStore.getCustomMargins();
         var orientationEnum =
             print_preview.ticket_items.CustomMargins.Orientation;
         ticket['marginsCustom'] = {
           'marginTop': customMargins.get(orientationEnum.TOP),
           'marginRight': customMargins.get(orientationEnum.RIGHT),
           'marginBottom': customMargins.get(orientationEnum.BOTTOM),
@@ skipping 563 matching lines @@
       return this.initialDestinationId_;
     }
   };
 
   // Export
   return {
     NativeInitialSettings: NativeInitialSettings,
     NativeLayer: NativeLayer
   };
 });