Replace "enable-encrypted-media" flag with "disable-encrypted-media".

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 38362afab1c4225a45cb932a3e50cf3ef99f99a0..5c4af42436916aa940f448031c8ce67e2396a927 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -337,13 +337,11 @@ 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.
+// TODO(jrummell): Merge into ECKEncryptedMediaTest once prefixed is removed.

[xhwang, 2015/01/22 22:25:42]

What do we need to merge? When prefixed test is removed, shall we just remove
this class?

[ddorwin, 2015/01/22 22:37:20]

When we disable prefixed by default, we'll need to have a Prefixed class that
enables prefixed. Once it's removed, we'll only have ECKEncryptedMediaTest.

What probably needs to happen is that we create a Prefixed class and make
unprefixed the default. We also need to run more tests on unprefixed. To keep
this CL simple and focused, I'd like to do that in a separate CL. We can remove
or update this TODO in that CL.

I updated the comment. WDYT?

[xhwang, 2015/01/22 22:46:20]

I see. I forgot we need to put the prefixed API behind a flag before we remove
it. The new comment lg. Thanks!

 class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaTestBase::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableEncryptedMedia);
     SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
   }
 };
@@ -354,7 +352,6 @@ class WVEncryptedMediaTest : public EncryptedMediaTestBase {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaTestBase::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableEncryptedMedia);
     SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line);
   }
 };
@@ -437,9 +434,6 @@ class EncryptedMediaTest
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaTestBase::SetUpCommandLine(command_line);
     SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line);
-
-    if (CurrentEmeVersion() == UNPREFIXED)
-      command_line->AppendSwitch(switches::kEnableEncryptedMedia);
   }
 };