diff options
| -rw-r--r-- | chrome/browser/extensions/extension_local_filesystem_apitest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/filesystem_handler/tab.html | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_local_filesystem_apitest.cc b/chrome/browser/extensions/extension_local_filesystem_apitest.cc index 617afc2..6b7d9c3 100644 --- a/chrome/browser/extensions/extension_local_filesystem_apitest.cc +++ b/chrome/browser/extensions/extension_local_filesystem_apitest.cc @@ -38,14 +38,7 @@ IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, LocalFileSystem) { } -#if defined(OS_CHROMEOS) -// http://crbug.com/103406 -#define MAYBE_FileBrowserTest DISABLED_FileBrowserTest -#else -#define MAYBE_FileBrowserTest FileBrowserTest -#endif - -IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, MAYBE_FileBrowserTest) { +IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTest) { AddTmpMountPoint(); ASSERT_TRUE(RunExtensionTest("filesystem_handler")) << message_; ASSERT_TRUE(RunComponentExtensionTest("filebrowser_component")) << message_; diff --git a/chrome/test/data/extensions/api_test/filesystem_handler/tab.html b/chrome/test/data/extensions/api_test/filesystem_handler/tab.html index ff93492..56639b6 100644 --- a/chrome/test/data/extensions/api_test/filesystem_handler/tab.html +++ b/chrome/test/data/extensions/api_test/filesystem_handler/tab.html @@ -77,7 +77,7 @@ function readEntryByUrl() { errorCallback); } -chrome.test.runTests([function tab() { +function onTabLoaded() { var entries = chrome.extension.getBackgroundPage().getLastFileEntries(); if (!entries || entries.length != 1 || !entries[0]) { chrome.extension.sendRequest( @@ -99,6 +99,6 @@ chrome.test.runTests([function tab() { entry.file(function(file) { reader.readAsText(file); }); -}]); +} </script> -<html><body><div id="content"></div></body></html> +<html><body onload="onTabLoaded();"><div id="content"></div></body></html> |