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

chrome/renderer/print_web_view_helper.cc

 // 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.
 
 #include "chrome/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1419 matching lines @@
     return false;
   }
 
   if (settings.params.dpi < kMinDpi || !settings.params.document_cookie) {
     print_preview_context_.set_error(PREVIEW_ERROR_UPDATING_PRINT_SETTINGS);
     return false;
   }
 
   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,
                                   &(settings.params.is_first_request))) {
       NOTREACHED();
       print_preview_context_.set_error(PREVIEW_ERROR_BAD_SETTING);
       return false;
     }
 
     settings.params.print_to_pdf = IsPrintToPdfRequested(*job_settings);
@@ skipping 149 matching lines @@
       break;
     }
     default: {
       NOTREACHED();
       return;
     }
   }
 }
 
 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;
 }
 
 bool PrintWebViewHelper::PreviewPageRendered(int page_number,
                                              printing::Metafile* metafile) {
   DCHECK_GE(page_number, printing::FIRST_PAGE_INDEX);
 
   // For non-modifiable files, |metafile| should be NULL, so do not bother
@@ skipping 253 matching lines @@
   DCHECK(IsRendering());
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }