Re-Revert "[WebModals] New API for browser-scoped popup management."

components/web_modal/web_contents_modal_dialog_manager.h

Index: components/web_modal/web_contents_modal_dialog_manager.h
diff --git a/components/web_modal/web_contents_modal_dialog_manager.h b/components/web_modal/web_contents_modal_dialog_manager.h
index 19d844c7d06db1abf6d9e3efeca6ca4d49b6740a..753130158cbab471866ba2e738b5a6abd0ee71f6 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.h
+++ b/components/web_modal/web_contents_modal_dialog_manager.h
@@ -47,10 +47,11 @@ class WebContentsModalDialogManager
 
   // Focus the topmost modal dialog.  IsDialogActive() must be true when calling
   // this function.
-  void FocusTopmostDialog() const;
+  void FocusTopmostDialog();
 
-  // SingleWebContentsDialogManagerDelegate:
+  // Overriden from SingleWebContentsDialogManagerDelegate:
   virtual content::WebContents* GetWebContents() const OVERRIDE;
+  // Called when a WebContentsModalDialogs we own is about to be closed.
   virtual void WillClose(NativeWebContentsModalDialog dialog) OVERRIDE;
 
   // For testing.
@@ -73,7 +74,6 @@ class WebContentsModalDialogManager
  private:
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
-  friend class PopupManager;
 
   struct DialogState {
     DialogState(NativeWebContentsModalDialog dialog,