Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / select_file_dialog_extension_browsertest.cc

diff --git a/src/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/src/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index 4936045..0e97597 100644 (file)
--- a/src/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/src/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -16,7 +16,6 @@
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/extensions/component_loader.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"
@@ -28,6 +27,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
+#include "extensions/test/extension_test_message_listener.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
@@ -333,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
 
   // Open a singleton tab in background.
   chrome::NavigateParams p(browser(), GURL("http://www.google.com"),
-                           content::PAGE_TRANSITION_LINK);
+                           ui::PAGE_TRANSITION_LINK);
   p.window_action = chrome::NavigateParams::SHOW_WINDOW;
   p.disposition = SINGLETON_TAB;
   chrome::Navigate(&p);