Add tests for the video player in Files.app.

chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

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 570e6f3c71b0b646663778365ebe5380d4c325ca..aac2d8d4b5e3997800be43999412f654778a9e7b 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 2086 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,12 @@ 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 video open test on the passed |volume|, shared by subclasses.
+  void DoTestVideoOpen(TestVolume* volume);
+
   // Runs the keyboard copy test on the passed |volume|, shared by subclasses.
   void DoTestKeyboardCopy(TestVolume* volume);
 
@@ -645,6 +653,18 @@ void FileManagerBrowserTestBase::DoTestGalleryOpen(TestVolume* volume) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
+void FileManagerBrowserTestBase::DoTestAudioOpen(TestVolume* volume) {
+  ResultCatcher catcher;
+  StartTest("audioOpen" + volume->GetName());

[hashimoto, 2013/05/28 07:54:12]

Can't these method inlined in the test bodies?
If we really want to eliminate duplication of "ResultCatcher cathcer;" and
"ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();", these lines should
be included in StartTest() instead. (currently this is not possible because of
DoTestFileDisplay(), though.)
Also, "audioOpenDrive" is more reader-friendly than "audioOpen" +
volume->GetName().

[mtomasz, 2013/05/28 10:26:38]

Sure, they can. I were this way for consistency. Fixed, done.

+  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
+void FileManagerBrowserTestBase::DoTestVideoOpen(TestVolume* volume) {
+  ResultCatcher catcher;
+  StartTest("videoOpen" + volume->GetName());
+  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
 void FileManagerBrowserTestBase::DoTestKeyboardCopy(TestVolume* volume) {
   base::FilePath copy_path =
       volume->GetRootPath().AppendASCII(kKeyboardTestFileCopyName);
@@ -780,6 +800,22 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, 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(FileManagerBrowserLocalTest, TestVideoOpen) {
+  DoTestVideoOpen(&volume_);
+}
+
+IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestVideoOpen) {
+  DoTestVideoOpen(&volume_);
+}
+
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, TestKeyboardCopy) {
   DoTestKeyboardCopy(&volume_);
 }