Fix Print Preview Alt + Left Arrow breakage

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/callback.h"
@@ skipping 26 matching lines @@
   PrintPreviewDialogController();
 
   static PrintPreviewDialogController* GetInstance();
 
   // Initiate print preview for |initiator|.
   // Call this instead of GetOrCreatePreviewDialog().
   static void PrintPreview(content::WebContents* initiator);
 
   // Get/Create the print preview dialog for |initiator|.
   // Exposed for unit tests.
-  content::WebContents* GetOrCreatePreviewDialog(
+  virtual content::WebContents* GetOrCreatePreviewDialog(
       content::WebContents* initiator);
 
   // Returns the preview dialog for |contents|.
   // Returns |contents| if |contents| is a preview dialog.
   // Returns NULL if no preview dialog exists for |contents|.
   content::WebContents* GetPrintPreviewForContents(
       content::WebContents* contents) const;
 
   // Returns the initiator for |preview_dialog|.
   // Returns NULL if no initiator exists for |preview_dialog|.
@@ skipping 14 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_;
   }
 
- private:
-  friend class base::RefCounted<PrintPreviewDialogController>;
+ protected:
+ // Moved to this category so that testing subclass works

[Lei Zhang, 2016/08/17 21:27:54]

No need for the comment in the code to check in. Maybe just write a comment in
code review instead next time?

+  ~PrintPreviewDialogController() override;
 
   // 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*>;
 
-  ~PrintPreviewDialogController() override;
+  // Mapping between print preview dialog and the corresponding initiator.
+  PrintPreviewDialogMap preview_dialog_map_;

[Lei Zhang, 2016/08/17 21:27:54]

Can we provide a setter method instead? Keep the member variable private.

+  virtual void RemoveInitiator(content::WebContents* initiator);
 
+  // Adds/removes observers for notifications from |contents|.
+  void AddObservers(content::WebContents* contents);
+  void RemoveObservers(content::WebContents* contents);
+
+ private:
+  friend class base::RefCounted<PrintPreviewDialogController>;
   // 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);
 
   // Handler for the NAV_ENTRY_COMMITTED notification. This is observed when the
   // renderer is navigated to a different page.
   void OnNavEntryCommitted(content::WebContents* contents,
                            content::LoadCommittedDetails* details);
 
   // Creates a new print preview dialog.
   content::WebContents* CreatePrintPreviewDialog(
       content::WebContents* initiator);
 
   // Helper function to store the title of the initiator associated with
   // |preview_dialog| in |preview_dialog|'s PrintPreviewUI.
   void SaveInitiatorTitle(content::WebContents* preview_dialog);
 
-  // Adds/Removes observers for notifications from |contents|.
-  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_;
-
   // 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_