Fix various issues from r343263.

chrome/browser/printing/print_preview_dialog_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 61 matching lines @@
   // Returns true if |url| is a print preview url.
   static bool IsPrintPreviewURL(const GURL& url);
 
   // Erase the initiator info associated with |preview_dialog|.
   void EraseInitiatorInfo(content::WebContents* preview_dialog);
 
   bool is_creating_print_preview_dialog() const {
     return is_creating_print_preview_dialog_;
   }
 
-  void AddProxyDialogForWebContents(content::WebContents* source,

[Lei Zhang, 2015/08/14 05:44:35]

It's not clear what |source| and |target| refers to.

-                                    content::WebContents* target);
+  void AddProxyDialogForWebContents(content::WebContents* distilled_contents,
+                                    content::WebContents* initiator);
 
-  void RemoveProxyDialogForWebContents(content::WebContents* source);
+  void RemoveProxyDialogForWebContents(
+      content::WebContents* distilled_contents);
 
  private:
   friend class base::RefCounted<PrintPreviewDialogController>;
 
   // 1:1 relationship between a print preview dialog and its initiator tab.
   // Key: Print preview dialog.
   // Value: Initiator.
   using PrintPreviewDialogMap =
       std::map<content::WebContents*, content::WebContents*>;
 
+  // 1:1 relationship between the distilled contents and its initiator tab.
+  // Key: Distilled contents.
+  // Value: Initiator.
+  using DistilledContentsMap =
+      std::map<content::WebContents*, content::WebContents*>;
+
   ~PrintPreviewDialogController() override;
 
   // Handler for the RENDERER_PROCESS_CLOSED notification. This is observed when
   // the initiator renderer crashed.
   void OnRendererProcessClosed(content::RenderProcessHost* rph);
 
   // Handler for the WEB_CONTENTS_DESTROYED notification. This is observed when
   // either WebContents is closed.
   void OnWebContentsDestroyed(content::WebContents* contents);
 
@@ skipping 14 matching lines @@
   void AddObservers(content::WebContents* contents);
   void RemoveObservers(content::WebContents* contents);
 
   // Removes WebContents when they close/crash/navigate.
   void RemoveInitiator(content::WebContents* initiator);
   void RemovePreviewDialog(content::WebContents* preview_dialog);
 
   // Mapping between print preview dialog and the corresponding initiator.
   PrintPreviewDialogMap preview_dialog_map_;
 
-  PrintPreviewDialogMap proxied_dialog_map_;

[Lei Zhang, 2015/08/14 05:44:35]

Please do not reuse PrintPreviewDialogMap. Even though this map has the same
std::map template as PrintPreviewDialogMap, the key and value in this map means
something entirely different.

+  // Mapping between distilled contents and the corresponding initiator.
+  DistilledContentsMap proxied_dialog_map_;
 
   // A registrar for listening to notifications.
   content::NotificationRegistrar registrar_;
 
   // True if the controller is waiting for a new preview dialog via
   // content::NAVIGATION_TYPE_NEW_PAGE.
   bool waiting_for_new_preview_page_;
 
   // Whether the PrintPreviewDialogController is in the middle of creating a
   // print preview dialog.
   bool is_creating_print_preview_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogController);
 };
 
 }  // namespace printing
 
 #endif  // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_