Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/tabs/tab_strip_model_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
-using web_modal::NativeWebContentsModalDialog;
 
 namespace {
 
 // Class used to delete a WebContents and TabStripModel when another WebContents
 // is destroyed.
 class DeleteWebContentsOnDestroyedObserver
     : public content::WebContentsObserver {
  public:
   // When |source| is deleted both |tab_to_delete| and |tab_strip| are deleted.
   // |tab_to_delete| and |tab_strip| may be NULL.
@@ skipping 48 matching lines @@
   int id() { return id_; }
 
  private:
   int id_;
 };
 
 class DummySingleWebContentsDialogManager
     : public web_modal::SingleWebContentsDialogManager {
  public:
   explicit DummySingleWebContentsDialogManager(
-      NativeWebContentsModalDialog dialog,
+      gfx::NativeWindow dialog,
       web_modal::SingleWebContentsDialogManagerDelegate* delegate)
       : delegate_(delegate),
         dialog_(dialog) {}
   ~DummySingleWebContentsDialogManager() override {}
 
   void Show() override {}
   void Hide() override {}
   void Close() override { delegate_->WillClose(dialog_); }
   void Focus() override {}
   void Pulse() override {}
   void HostChanged(web_modal::WebContentsModalDialogHost* new_host) override {}
-  NativeWebContentsModalDialog dialog() override { return dialog_; }
+  gfx::NativeWindow dialog() override { return dialog_; }
 
  private:
   web_modal::SingleWebContentsDialogManagerDelegate* delegate_;
-  NativeWebContentsModalDialog dialog_;
+  gfx::NativeWindow dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySingleWebContentsDialogManager);
 };
 
 // Test Browser-like class for TabStripModelTest.TabBlockedState.
 class TabBlockedStateTestBrowser
     : public TabStripModelObserver,
       public web_modal::WebContentsModalDialogManagerDelegate {
  public:
   explicit TabBlockedStateTestBrowser(TabStripModel* tab_strip_model)
@@ skipping 2523 matching lines @@
   TabBlockedStateTestBrowser browser_dst(&strip_dst);
 
   // Setup a SingleWebContentsDialogManager for tab |contents2|.
   web_modal::WebContentsModalDialogManager* modal_dialog_manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(contents2);
   web_modal::PopupManager popup_manager(NULL);
   popup_manager.RegisterWith(contents2);
 
   // Show a dialog that blocks tab |contents2|.
   // DummySingleWebContentsDialogManager doesn't care about the
-  // NativeWebContentsModalDialog value, so any dummy value works.
+  // dialog window value, so any dummy value works.
   DummySingleWebContentsDialogManager* native_manager =
       new DummySingleWebContentsDialogManager(
-          reinterpret_cast<NativeWebContentsModalDialog>(0),
-          modal_dialog_manager);
+          reinterpret_cast<gfx::NativeWindow>(0), modal_dialog_manager);
   modal_dialog_manager->ShowDialogWithManager(
-      reinterpret_cast<NativeWebContentsModalDialog>(0),
+      reinterpret_cast<gfx::NativeWindow>(0),
       scoped_ptr<web_modal::SingleWebContentsDialogManager>(
           native_manager).Pass());
   EXPECT_TRUE(strip_src.IsTabBlocked(1));
 
   // Detach the tab.
   WebContents* moved_contents = strip_src.DetachWebContentsAt(1);
   EXPECT_EQ(contents2, moved_contents);
 
   // Attach the tab to the destination tab strip.
   strip_dst.AppendWebContents(moved_contents, true);
   EXPECT_TRUE(strip_dst.IsTabBlocked(0));
 
   strip_dst.CloseAllTabs();
   strip_src.CloseAllTabs();
 }