Aura: Disable SelectFileDialogExtensionBrowserTest on non-ChromeOS

It's going to be a bit of work to get the component-extension file picker working on non-ChromeOS platforms.  Until then, disable the SelectFileDialogExtensionBrowserTest -- it won't work until a lot more plumbing is ready in the local filesystem API and mount point providers.

BUG=97424
TEST=linux_aura and linux_chromeos_aura both compile and work on my machine

Review URL: http://codereview.chromium.org/8589030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110647 0039d316-1c4b-4281-b951-d872f2087c98
parent d6087963
...@@ -384,6 +384,8 @@ void FactoryRegistry::ResetFunctions() { ...@@ -384,6 +384,8 @@ void FactoryRegistry::ResetFunctions() {
RegisterFunction<GetChromeosInfoFunction>(); RegisterFunction<GetChromeosInfoFunction>();
// FileBrowserPrivate functions. // FileBrowserPrivate functions.
// TODO(jamescook): Expose these on non-ChromeOS platforms so we can use
// the extension-based file picker on Aura. crbug.com/97424
RegisterFunction<CancelFileDialogFunction>(); RegisterFunction<CancelFileDialogFunction>();
RegisterFunction<ExecuteTasksFileBrowserFunction>(); RegisterFunction<ExecuteTasksFileBrowserFunction>();
RegisterFunction<FileDialogStringsFunction>(); RegisterFunction<FileDialogStringsFunction>();
......
...@@ -206,8 +206,15 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, DestroyListener) { ...@@ -206,8 +206,15 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, DestroyListener) {
// TODO(jamescook): Add a test for selecting a file for an <input type='file'/> // TODO(jamescook): Add a test for selecting a file for an <input type='file'/>
// page element, as that uses different memory management pathways. // page element, as that uses different memory management pathways.
// crbug.com/98791 // crbug.com/98791
// TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
#if !defined(OS_CHROMEOS)
#define MAYBE_SelectFileAndCancel DISABLED_SelectFileAndCancel
#else
#define MAYBE_SelectFileAndCancel SelectFileAndCancel
#endif
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
SelectFileAndCancel) { MAYBE_SelectFileAndCancel) {
// Add tmp mount point even though this test won't use it directly. // Add tmp mount point even though this test won't use it directly.
// We need this to make sure that at least one top-level directory exists // We need this to make sure that at least one top-level directory exists
// in the file browser. // in the file browser.
...@@ -228,8 +235,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, ...@@ -228,8 +235,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
ASSERT_EQ(this, listener_->params()); ASSERT_EQ(this, listener_->params());
} }
// TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
#if !defined(OS_CHROMEOS)
#define MAYBE_SelectFileAndOpen DISABLED_SelectFileAndOpen
#else
#define MAYBE_SelectFileAndOpen SelectFileAndOpen
#endif
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
SelectFileAndOpen) { MAYBE_SelectFileAndOpen) {
// Allow the tmp directory to be mounted. We explicitly use /tmp because // Allow the tmp directory to be mounted. We explicitly use /tmp because
// it it whitelisted for file system access on Chrome OS. // it it whitelisted for file system access on Chrome OS.
FilePath tmp_dir("/tmp"); FilePath tmp_dir("/tmp");
...@@ -267,8 +280,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, ...@@ -267,8 +280,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
ASSERT_EQ(this, listener_->params()); ASSERT_EQ(this, listener_->params());
} }
// TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
#if !defined(OS_CHROMEOS)
#define MAYBE_SelectFileAndSave DISABLED_SelectFileAndSave
#else
#define MAYBE_SelectFileAndSave SelectFileAndSave
#endif
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
SelectFileAndSave) { MAYBE_SelectFileAndSave) {
// Allow the tmp directory to be mounted. We explicitly use /tmp because // Allow the tmp directory to be mounted. We explicitly use /tmp because
// it it whitelisted for file system access on Chrome OS. // it it whitelisted for file system access on Chrome OS.
FilePath tmp_dir("/tmp"); FilePath tmp_dir("/tmp");
...@@ -301,8 +320,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, ...@@ -301,8 +320,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
ASSERT_EQ(this, listener_->params()); ASSERT_EQ(this, listener_->params());
} }
// TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
#if !defined(OS_CHROMEOS)
#define MAYBE_OpenSingletonTabAndCancel DISABLED_OpenSingletonTabAndCancel
#else
#define MAYBE_OpenSingletonTabAndCancel OpenSingletonTabAndCancel
#endif
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
OpenSingletonTabAndCancel) { MAYBE_OpenSingletonTabAndCancel) {
// Add tmp mount point even though this test won't use it directly. // Add tmp mount point even though this test won't use it directly.
// We need this to make sure that at least one top-level directory exists // We need this to make sure that at least one top-level directory exists
// in the file browser. // in the file browser.
...@@ -329,7 +354,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, ...@@ -329,7 +354,14 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
ASSERT_EQ(this, listener_->params()); ASSERT_EQ(this, listener_->params());
} }
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, OpenTwoDialogs) { // TODO(jamescook): Make dialog work on non-ChromeOS platforms. crbug.com/97424
#if !defined(OS_CHROMEOS)
#define MAYBE_OpenTwoDialogs DISABLED_OpenTwoDialogs
#else
#define MAYBE_OpenTwoDialogs OpenTwoDialogs
#endif
IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest,
MAYBE_OpenTwoDialogs) {
// Add tmp mount point even though this test won't use it directly. // Add tmp mount point even though this test won't use it directly.
// We need this to make sure that at least one top-level directory exists // We need this to make sure that at least one top-level directory exists
// in the file browser. // in the file browser.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment