Start consolidating non-port specific code to ui/base/dialogs.

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"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"  // ASCIIToUTF16
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #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 "chrome/test/base/ui_test_utils.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/common/selected_file_info.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"
 
 using content::BrowserContext;
 
 // Mock listener used by test below.
 class MockSelectFileDialogListener : public SelectFileDialog::Listener {
  public:
   MockSelectFileDialogListener()
     : file_selected_(false),
       canceled_(false),
       params_(NULL) {
   }
 
   bool file_selected() const { return file_selected_; }
   bool canceled() const { return canceled_; }
   FilePath path() const { return path_; }
   void* params() const { return params_; }
 
   // SelectFileDialog::Listener implementation.
   virtual void FileSelected(const FilePath& path, int index, void* params) {
     file_selected_ = true;
     path_ = path;
     params_ = params;
   }
   virtual void FileSelectedWithExtraInfo(
-      const content::SelectedFileInfo& selected_file_info,
+      const ui::SelectedFileInfo& selected_file_info,
       int index,
       void* params) {
     FileSelected(selected_file_info.path, index, params);
   }
   virtual void MultiFilesSelected(
       const std::vector<FilePath>& files, void* params) {}
   virtual void FileSelectionCanceled(void* params) {
     canceled_ = true;
     params_ = params;
   }
@@ skipping 274 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());
 }