Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h

 // Copyright 2015 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_UI_COCOA_SINGLE_WEB_CONTENTS_DIALOG_MANAGER_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_SINGLE_WEB_CONTENTS_DIALOG_MANAGER_COCOA_H_
 
 #import "base/mac/scoped_nsobject.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
 
@@ skipping 10 matching lines @@
       web_modal::SingleWebContentsDialogManagerDelegate* delegate);
   ~SingleWebContentsDialogManagerCocoa() override;
 
   // SingleWebContentsDialogManager overrides.
   void Show() override;
   void Hide() override;
   void Close() override;
   void Focus() override;
   void Pulse() override;
   void HostChanged(web_modal::WebContentsModalDialogHost* new_host) override;
-  web_modal::NativeWebContentsModalDialog dialog() override;
+  gfx::NativeWindow dialog() override;
 
  private:
   ConstrainedWindowMac* client_;  // Weak. Can be null.
   base::scoped_nsprotocol<id<ConstrainedWindowSheet>> sheet_;
   // Weak. Owns this.
   web_modal::SingleWebContentsDialogManagerDelegate* delegate_;
   bool shown_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleWebContentsDialogManagerCocoa);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_SINGLE_WEB_CONTENTS_DIALOG_MANAGER_COCOA_H_