Integrate browser tests with new EME player.

chrome/browser/media/encrypted_media_browsertest.cc

Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 875a00389b7fd9a5057816d0db8226856453f2a6..7588b2bb663f70b58f12c5d20649d8e2d745a8d3 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -64,9 +64,11 @@ const char kLoadableSession[] = "LoadableSession";
 const char kUnknownSession[] = "UnknownSession";
 
 // EME-specific test results and errors.
-const char kEmeKeyError[] = "KEYERROR";
+const char kEmeKeyError[] = "KEY_ERROR";
 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
-const char kFileIOTestSuccess[] = "FILEIOTESTSUCCESS";
+const char kFileIOTestSuccess[] = "FILE_IO_TEST_SUCCESS";
+
+const char kDefaultEMEPlayer[] = "eme_player.html";

[ddorwin, 2014/05/30 17:42:56]

"Eme"

[shadi, 2014/05/31 00:31:37]

Done.

 
 // The type of video src used to load media.
 enum SrcType {
@@ -167,7 +169,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
     if (!IsPlayBackPossible(key_system))
       expected_title = kEmeKeyError;
 
-    RunEncryptedMediaTest("encrypted_media_player.html",
+    RunEncryptedMediaTest(kDefaultEMEPlayer,
                           media_file,
                           media_type,
                           key_system,
@@ -308,7 +310,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase {
                             const std::string& expected_title) {
     // Since we do not test playback, arbitrarily choose a test file and source
     // type.
-    RunEncryptedMediaTest("encrypted_media_player.html",
+    RunEncryptedMediaTest(kDefaultEMEPlayer,
                           "bear-a-enc_a.webm",
                           kWebMAudioOnly,
                           key_system,
@@ -375,7 +377,7 @@ class EncryptedMediaTest
   }
 
   void RunInvalidResponseTest() {
-    RunEncryptedMediaTest("encrypted_media_player.html",
+    RunEncryptedMediaTest(kDefaultEMEPlayer,
                           "bear-320x240-av-enc_av.webm",
                           kWebMAudioVideo,
                           CurrentKeySystem(),
@@ -591,7 +593,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
 // The parent key system cannot be used in generateKeyRequest.
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException_Prefixed) {
-  RunEncryptedMediaTest("encrypted_media_player.html",
+  RunEncryptedMediaTest(kDefaultEMEPlayer,
                         "bear-a-enc_a.webm",
                         kWebMAudioOnly,
                         "com.widevine",
@@ -605,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException_Prefixed) {
 // TODO(jrummell): http://crbug.com/349181
 // The parent key system cannot be used when creating MediaKeys.
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException) {
-  RunEncryptedMediaTest("encrypted_media_player.html",
+  RunEncryptedMediaTest(kDefaultEMEPlayer,
                         "bear-a-enc_a.webm",
                         kWebMAudioOnly,
                         "com.widevine",
@@ -642,7 +644,7 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
 }
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
-  RunEncryptedMediaTest("encrypted_media_player.html",
+  RunEncryptedMediaTest(kDefaultEMEPlayer,
                         "bear-320x240-v-enc_v.webm",
                         kWebMVideoOnly,
                         kExternalClearKeyKeySystem,
@@ -655,7 +657,7 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
   // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
-  RunEncryptedMediaTest("encrypted_media_player.html",
+  RunEncryptedMediaTest(kDefaultEMEPlayer,
                         "bear-320x240-v-enc_v.webm",
                         kWebMVideoOnly,
                         kExternalClearKeyKeySystem,