Remove redirection header and add "ui::" before all SelectFileDialog usage.

chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc

Index: chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index 0b560b1b71a3507fa8f7ab5e0b7a22c8e1f5f110..f0c94f7b35ea9068f19ad6a52ab008eeafc77e7d 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -18,12 +18,12 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/select_file_dialog.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
+#include "ui/base/dialogs/select_file_dialog.h"
 #include "ui/base/dialogs/selected_file_info.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
@@ -31,7 +31,7 @@
 using content::BrowserContext;
 
 // Mock listener used by test below.
-class MockSelectFileDialogListener : public SelectFileDialog::Listener {
+class MockSelectFileDialogListener : public ui::SelectFileDialog::Listener {
  public:
   MockSelectFileDialogListener()
     : file_selected_(false),
@@ -44,7 +44,7 @@ class MockSelectFileDialogListener : public SelectFileDialog::Listener {
   FilePath path() const { return path_; }
   void* params() const { return params_; }
 
-  // SelectFileDialog::Listener implementation.
+  // ui::SelectFileDialog::Listener implementation.
   virtual void FileSelected(const FilePath& path,
                             int index,
                             void* params) OVERRIDE {
@@ -117,7 +117,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest {
     provider->AddLocalMountPoint(path);
   }
 
-  void OpenDialog(SelectFileDialog::Type dialog_type,
+  void OpenDialog(ui::SelectFileDialog::Type dialog_type,
                   const FilePath& file_path,
                   const gfx::NativeWindow& owning_window,
                   const std::string& additional_message) {
@@ -161,7 +161,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest {
 
     // At the moment we don't really care about dialog type, but we have to put
     // some dialog type.
-    second_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
+    second_dialog_->SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE,
                                string16() /* title */,
                                FilePath() /* default_path */,
                                NULL /* file_types */,
@@ -232,7 +232,8 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
   gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
   // FilePath() for default path.
-  OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
+  OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window,
+             "");
 
   // Press cancel button.
   CloseDialog(DIALOG_BTN_CANCEL, owning_window);
@@ -261,7 +262,7 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
   // 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,
+  OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE, test_file, owning_window,
              "selection-change-complete");
 
   // Click open button.
@@ -287,8 +288,8 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
   // 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");
+  OpenDialog(ui::SelectFileDialog::SELECT_SAVEAS_FILE, test_file,
+             owning_window, "directory-change-complete");
 
   // Click save button.
   CloseDialog(DIALOG_BTN_OK, owning_window);
@@ -306,7 +307,8 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
-  OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
+  OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window,
+             "");
 
   // Open a singleton tab in background.
   chrome::NavigateParams p(browser(), GURL("www.google.com"),
@@ -330,7 +332,8 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
 
   gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow();
 
-  OpenDialog(SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window, "");
+  OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE, FilePath(), owning_window,
+             "");
 
   TryOpeningSecondDialog(owning_window);