Revert "Add unprefixed EME tests for LoadSession()"

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 da9f0c0cc2c55424954d17760afc1a6b299a0882..bd6cd7d09f256cc3f1a7c66801b6d7bf1b52e521 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -332,19 +332,6 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase {
   }
 };
 
-// Tests encrypted media playback using ExternalClearKey key system in
-// decrypt-and-decode mode for unprefixed EME.
-// TODO(jrummell): Merge with ECKEncryptedMediaTest once unprefixed is
-// enabled by default.
-class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase {
- protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) override {
-    EncryptedMediaTestBase::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableEncryptedMedia);
-    SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
-  }
-};
-
 #if defined(WIDEVINE_CDM_AVAILABLE)
 // Tests encrypted media playback using Widevine key system.
 class WVEncryptedMediaTest : public EncryptedMediaTestBase {
@@ -679,29 +666,4 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
                         false,
                         kEmeKeyError);
 }
-
-IN_PROC_BROWSER_TEST_F(ECKUnprefixedEncryptedMediaTest, LoadLoadableSession) {
-  RunEncryptedMediaTest(kDefaultEmePlayer,
-                        "bear-320x240-v_enc-v.webm",
-                        kWebMVideoOnly,
-                        kExternalClearKeyKeySystem,
-                        SRC,
-                        UNPREFIXED,
-                        kLoadableSession,
-                        false,
-                        kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(ECKUnprefixedEncryptedMediaTest, LoadUnknownSession) {
-  // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
-  RunEncryptedMediaTest(kDefaultEmePlayer,
-                        "bear-320x240-v_enc-v.webm",
-                        kWebMVideoOnly,
-                        kExternalClearKeyKeySystem,
-                        SRC,
-                        UNPREFIXED,
-                        kUnknownSession,
-                        false,
-                        kEmeKeyError);
-}
 #endif  // defined(ENABLE_PEPPER_CDMS)