Merge 153342 - Print preview: Use an ID instead of memory pointer string in WebUI.

chrome/renderer/print_web_view_helper.cc

Index: chrome/renderer/print_web_view_helper.cc
===================================================================
--- chrome/renderer/print_web_view_helper.cc	(revision 153583)
+++ chrome/renderer/print_web_view_helper.cc	(working copy)
@@ -1437,8 +1437,8 @@
 
   if (!print_for_preview_) {
     // Validate expected print preview settings.
-    if (!job_settings->GetString(printing::kPreviewUIAddr,
-                                 &(settings.params.preview_ui_addr)) ||
+    if (!job_settings->GetInteger(printing::kPreviewUIID,
+                                  &(settings.params.preview_ui_id)) ||
         !job_settings->GetInteger(printing::kPreviewRequestID,
                                   &(settings.params.preview_request_id)) ||
         !job_settings->GetBoolean(printing::kIsFirstRequest,
@@ -1608,12 +1608,12 @@
 }
 
 bool PrintWebViewHelper::CheckForCancel() {
+  const PrintMsg_Print_Params& print_params = print_pages_params_->params;
   bool cancel = false;
-  Send(new PrintHostMsg_CheckForCancel(
-      routing_id(),
-      print_pages_params_->params.preview_ui_addr,
-      print_pages_params_->params.preview_request_id,
-      &cancel));
+  Send(new PrintHostMsg_CheckForCancel(routing_id(),
+                                       print_params.preview_ui_id,
+                                       print_params.preview_request_id,
+                                       &cancel));
   if (cancel)
     notify_browser_of_print_failure_ = false;
   return cancel;