Fix various issues from r343263.

chrome/browser/printing/print_preview_dialog_controller.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/browser/printing/print_preview_dialog_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 165 matching lines @@
   if (!preview_dialog)
     return CreatePrintPreviewDialog(initiator);
 
   // Show the initiator holding the existing preview dialog.
   initiator->GetDelegate()->ActivateContents(initiator);
   return preview_dialog;
 }
 
 WebContents* PrintPreviewDialogController::GetPrintPreviewForContents(
     WebContents* contents) const {
-  // If this WebContents relies on another for its preview dialog, we
-  // need to act as if we are looking for the proxied content's dialog.
-  PrintPreviewDialogMap::const_iterator proxied =
+  // If this WebContents relies on another for its preview dialog, look for the
+  // original initiator.
+  DistilledContentsMap::const_iterator proxied =
       proxied_dialog_map_.find(contents);
   if (proxied != proxied_dialog_map_.end()) {
     contents = proxied->second;
   }
 
   // |preview_dialog_map_| is keyed by the preview dialog, so if find()
   // succeeds, then |contents| is the preview dialog.
   PrintPreviewDialogMap::const_iterator it = preview_dialog_map_.find(contents);
   if (it != preview_dialog_map_.end())
     return contents;
@@ skipping 181 matching lines @@
   // Make the print preview WebContents show up in the task manager.
   task_management::WebContentsTags::CreateForPrintingContents(preview_dialog);
 
   AddObservers(initiator);
   AddObservers(preview_dialog);
 
   return preview_dialog;
 }
 
 void PrintPreviewDialogController::AddProxyDialogForWebContents(
-    WebContents* source,
-    WebContents* target) {
-  proxied_dialog_map_[source] = target;
+    WebContents* distilled_contents,
+    WebContents* initiator) {
+  DCHECK(!ContainsKey(proxied_dialog_map_, distilled_contents));
+  proxied_dialog_map_[distilled_contents] = initiator;
 }
 
 void PrintPreviewDialogController::RemoveProxyDialogForWebContents(
-    WebContents* source) {
-  proxied_dialog_map_.erase(source);
+    WebContents* distilled_contents) {
+  size_t erased = proxied_dialog_map_.erase(distilled_contents);
+  DCHECK_EQ(1U, erased);
 }
 
 void PrintPreviewDialogController::SaveInitiatorTitle(
     WebContents* preview_dialog) {
   WebContents* initiator = GetInitiator(preview_dialog);
   if (initiator && preview_dialog->GetWebUI()) {
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         preview_dialog->GetWebUI()->GetController());
     print_preview_ui->SetInitiatorTitle(
         PrintViewManager::FromWebContents(initiator)->RenderSourceName());
@@ skipping 71 matching lines @@
         static_cast<PrintPreviewUI*>(web_ui->GetController());
     if (print_preview_ui)
       print_preview_ui->OnPrintPreviewDialogDestroyed();
   }
 
   preview_dialog_map_.erase(preview_dialog);
   RemoveObservers(preview_dialog);
 }
 
 }  // namespace printing