Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow()

chrome/browser/ui/views/select_file_dialog_extension_browsertest.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/views/select_file_dialog_extension.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 190 matching lines @@
 
   scoped_ptr<MockSelectFileDialogListener> second_listener_;
   scoped_refptr<SelectFileDialogExtension> second_dialog_;
 
   ScopedTempDir tmp_dir_;
   FilePath downloads_dir_;
 };
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, CreateAndDestroy) {
   // Browser window must be up for us to test dialog window parent.
-  gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow native_window = browser()->window()->GetNativeWindow();
   ASSERT_TRUE(native_window != NULL);
 
   // Before we call SelectFile, dialog is not running/visible.
   ASSERT_FALSE(dialog_->IsRunning(native_window));
 }
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, DestroyListener) {
   // Some users of SelectFileDialog destroy their listener before cleaning
   // up the dialog.  Make sure we don't crash.
   dialog_->ListenerDestroyed();
   listener_.reset();
 }
 
 // TODO(jamescook): Add a test for selecting a file for an <input type='file'/>
 // page element, as that uses different memory management pathways.
 // crbug.com/98791
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        SelectFileAndCancel) {
   AddMountPoint(downloads_dir_);
 
-  gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   // FilePath() for default path.
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   // Press cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        SelectFileAndOpen) {
   AddMountPoint(downloads_dir_);
 
   FilePath test_file = downloads_dir_.AppendASCII("file_manager_test.html");
 
   // Create an empty file to give us something to select.
   FILE* fp = file_util::OpenFile(test_file, "w");
   ASSERT_TRUE(fp != NULL);
   ASSERT_TRUE(file_util::CloseFile(fp));
 
-  gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   // Spawn a dialog to open a file.  Provide the path to the file so the dialog
   // will automatically select it.  Ensure that the OK button is enabled by
   // waiting for chrome.test.sendMessage('selection-change-complete').
   // The extension starts a Web Worker to read file metadata, so it may send
   // 'selection-change-complete' before 'worker-initialized'.  This is OK.
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, test_file, owning_window,
              "selection-change-complete");
 
   // Click open button.
   CloseDialog(DIALOG_BTN_OK, owning_window);
 
   // Listener should have been informed that the file was opened.
   ASSERT_TRUE(listener_->file_selected());
   ASSERT_FALSE(listener_->canceled());
   ASSERT_EQ(test_file, listener_->path());
   ASSERT_EQ(this, listener_->params());
 }
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        SelectFileAndSave) {
   AddMountPoint(downloads_dir_);
 
   FilePath test_file = downloads_dir_.AppendASCII("file_manager_test.html");
 
-  gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   // Spawn a dialog to save a file, providing a suggested path.
   // Ensure "Save" button is enabled by waiting for notification from
   // chrome.test.sendMessage().
   // The extension starts a Web Worker to read file metadata, so it may send
   // 'directory-change-complete' before 'worker-initialized'.  This is OK.
   OpenDialog(SelectFileDialog::SELECT_SAVEAS_FILE, test_file, owning_window,
              "directory-change-complete");
 
   // Click save button.
   CloseDialog(DIALOG_BTN_OK, owning_window);
 
   // Listener should have been informed that the file was selected.
   ASSERT_TRUE(listener_->file_selected());
   ASSERT_FALSE(listener_->canceled());
   ASSERT_EQ(test_file, listener_->path());
   ASSERT_EQ(this, listener_->params());
 }
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        OpenSingletonTabAndCancel) {
   AddMountPoint(downloads_dir_);
 
-  gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   // Open a singleton tab in background.
   browser::NavigateParams p(browser(), GURL("www.google.com"),
                             content::PAGE_TRANSITION_LINK);
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.disposition = SINGLETON_TAB;
   browser::Navigate(&p);
 
   // Press cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }
 
 IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
                        OpenTwoDialogs) {
   AddMountPoint(downloads_dir_);
 
-  gfx::NativeWindow owning_window = browser()->window()->GetNativeHandle();
+  gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
 
   TryOpeningSecondDialog(owning_window);
 
   // Second dialog should not be running.
   ASSERT_FALSE(second_dialog_->IsRunning(owning_window));
 
   // Click cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }