Remove NativeWebContentsModalDialog and NativePopup typedefs.

components/web_modal/popup_manager.h

Index: components/web_modal/popup_manager.h
diff --git a/components/web_modal/popup_manager.h b/components/web_modal/popup_manager.h
index 9d0c9fb7216e3af5bdb04295be6be9f7815a09fe..32ade7a9f1118cc78f443555b861ec3953960e2d 100644
--- a/components/web_modal/popup_manager.h
+++ b/components/web_modal/popup_manager.h
@@ -38,7 +38,7 @@ class PopupManager : public SinglePopupManagerDelegate {
 
   // Temporary method: Provides compatibility with existing
   // WebContentsModalDialogManager code.
-  virtual void ShowModalDialog(NativePopup popup,
+  virtual void ShowModalDialog(gfx::NativeWindow popup,
                                content::WebContents* web_contents);
 
   // Returns true if a web modal dialog is active and not closed in the
@@ -47,8 +47,8 @@ class PopupManager : public SinglePopupManagerDelegate {
   virtual bool IsWebModalDialogActive(
       const content::WebContents* web_contents) const;
 
-  // Called when a NativePopup we own is about to be closed.
-  void WillClose(NativePopup popup) override;
+  // Called when a native popup we own is about to be closed.
+  void WillClose(gfx::NativeWindow popup) override;
 
   // Called by views code to re-activate popups anchored to a particular tab
   // when that tab gets focus. Note that depending on the situation, more than