media: Prefer decrypting pipeline when CDM is attached

chrome/browser/media/encrypted_media_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 541 matching lines @@
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
   RunInvalidResponseTest();
 }
 
 // Strictly speaking this is not an "encrypted" media test. Keep it here for
 // completeness.
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToClear) {
   TestConfigChange(ConfigChangeType::CLEAR_TO_CLEAR);
 }
 
-// TODO(xhwang): Support switching from clear to encrypted and fix the test
-// expectation. Currently this test passes when we do decrypt-and-decode but
-// fails when we do decrypt-only due to how decoder reselection during config
-// change is handled. See http://crbug.com/597443
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_ConfigChangeVideo_ClearToEncrypted) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToEncrypted) {
   TestConfigChange(ConfigChangeType::CLEAR_TO_ENCRYPTED);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_EncryptedToClear) {
   TestConfigChange(ConfigChangeType::ENCRYPTED_TO_CLEAR);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
                        ConfigChangeVideo_EncryptedToEncrypted) {
   TestConfigChange(ConfigChangeType::ENCRYPTED_TO_ENCRYPTED);
@@ skipping 162 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
   TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
                        kUnitTestSuccess);
 }
 
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 }  // namespace chrome