Commit 6a2585b6 authored by fukino@chromium.org's avatar fukino@chromium.org

Files.app: Enable unintentionally-disabled browser tests.

All browser tests of File.app were disabled unintentionally by crrev.com/444223003
This CL enables those tests and disables OpenVideoFile and OpenAudioFile individually.

BUG=400892
TEST=run browser_tests

Review URL: https://codereview.chromium.org/445933006

Cr-Commit-Position: refs/heads/master@{#288316}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288316 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c583b68
......@@ -747,8 +747,7 @@ class FileManagerBrowserTest :
}
};
// http://crbug.com/400892
IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, DISABLED_Test) {
IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) {
StartTest();
}
......@@ -784,27 +783,17 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "zipOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "zipOpenDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
#if !defined(NDEBUG)
#define MAYBE_OpenVideoFiles DISABLED_OpenVideoFiles
#else
#define MAYBE_OpenVideoFiles OpenVideoFiles
#endif
// http://crbug.com/400892
WRAPPED_INSTANTIATE_TEST_CASE_P(
MAYBE_OpenVideoFiles,
DISABLED_OpenVideoFiles,
FileManagerBrowserTest,
::testing::Values(TestParameter(IN_GUEST_MODE, "videoOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "videoOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "videoOpenDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
#if !defined(NDEBUG)
#define MAYBE_OpenAudioFiles DISABLED_OpenAudioFiles
#else
#define MAYBE_OpenAudioFiles OpenAudioFiles
#endif
// http://crbug.com/401674
WRAPPED_INSTANTIATE_TEST_CASE_P(
MAYBE_OpenAudioFiles,
DISABLED_OpenAudioFiles,
FileManagerBrowserTest,
::testing::Values(
TestParameter(IN_GUEST_MODE, "audioOpenDownloads"),
......
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