Revert of Refoctoring FileSelection and FileSelectionHandler.

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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 261 matching lines @@
   ASSERT_TRUE(fp != NULL);
   ASSERT_TRUE(base::CloseFile(fp));
 
   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').
   ASSERT_NO_FATAL_FAILURE(OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE,
                                      test_file, owning_window,
-                                     "dialog-ready"));
+                                     "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_);
 
   base::FilePath test_file =
       downloads_dir_.AppendASCII("file_manager_test.html");
 
   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().
   ASSERT_NO_FATAL_FAILURE(OpenDialog(ui::SelectFileDialog::SELECT_SAVEAS_FILE,
                                      test_file, owning_window,
-                                     "dialog-ready"));
+                                     "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());
 }
@@ skipping 38 matching lines @@
   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());
 }