Index: chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc |
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc |
index ce68228d795187e19f9cbc7c4c6e29c6cb281c74..aeddcb89289bcc41fb0b1e37338386b258de8b37 100644 |
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc |
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc |
@@ -66,6 +66,8 @@ TestEntryInfo kTestEntrySetCommon[] = { |
{ FILE, "text.txt", "hello.txt", "text/plain", NONE, "4 Sep 1998 12:34:56" }, |
{ FILE, "image.png", "My Desktop Background.png", "text/plain", NONE, |
"18 Jan 2038 01:02:03" }, |
+ { FILE, "music.ogg", "Beautiful Song.ogg", "text/plain", NONE, |
+ "12 Nov 2012 12:00:00" }, |
{ FILE, "video.ogv", kKeyboardTestFileName, "text/plain", NONE, |
"4 July 2012 10:35:00" }, |
{ DIRECTORY, "", "photos", NULL, NONE, "1 Jan 1980 23:59:59" }, |
@@ -583,6 +585,9 @@ class FileManagerBrowserTestBase : public ExtensionApiTest, |
// Runs the gallery open test on the passed |volume|, shared by subclasses. |
void DoTestGalleryOpen(TestVolume* volume); |
+ // Runs the audio open test on the passed |volume|, shared by subclasses. |
+ void DoTestAudioOpen(TestVolume* volume); |
+ |
// Runs the keyboard copy test on the passed |volume|, shared by subclasses. |
void DoTestKeyboardCopy(TestVolume* volume); |
@@ -645,6 +650,12 @@ void FileManagerBrowserTestBase::DoTestGalleryOpen(TestVolume* volume) { |
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
} |
+void FileManagerBrowserTestBase::DoTestAudioOpen(TestVolume* volume) { |
+ ResultCatcher catcher; |
+ StartTest("audioOpen" + volume->GetName()); |
+ ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
+} |
+ |
void FileManagerBrowserTestBase::DoTestKeyboardCopy(TestVolume* volume) { |
base::FilePath copy_path = |
volume->GetRootPath().AppendASCII(kKeyboardTestFileCopyName); |
@@ -782,6 +793,14 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, DISABLED_TestGalleryOpen) { |
DoTestGalleryOpen(&volume_); |
} |
+IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestAudioOpen) { |
+ DoTestAudioOpen(&volume_); |
+} |
+ |
+IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestAudioOpen) { |
+ DoTestAudioOpen(&volume_); |
+} |
+ |
IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardCopy) { |
DoTestKeyboardCopy(&volume_); |
} |