Reland "Add unprefixed EME tests for LoadSession()"

content/browser/media/encrypted_media_browsertest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 65 matching lines @@
 
   void TestConfigChange() {
     if (CurrentSourceType() != MSE || !IsMSESupported()) {
       VLOG(0) << "Skipping test - config change test requires MSE.";
       return;
     }
 
     base::StringPairs query_params;
     query_params.push_back(std::make_pair("keySystem", CurrentKeySystem()));
     query_params.push_back(std::make_pair("runEncrypted", "1"));
+    query_params.push_back(std::make_pair("usePrefixedEME", "1"));
     RunMediaTestPage("mse_config_change.html", query_params, kEnded, true);
   }
 
   void RunEncryptedMediaTest(const std::string& html_page,
                              const std::string& media_file,
                              const std::string& media_type,
                              const std::string& key_system,
                              SrcType src_type,
                              const std::string& expectation) {
 #if defined(OS_ANDROID) && defined(__aarch64__)
     // Disable EME tests on arm64 due to timeouts: http://crbug.com/418039
     return;
 #endif
     if (src_type == MSE && !IsMSESupported()) {
       VLOG(0) << "Skipping test - MSE not supported.";
       return;
     }
 
     base::StringPairs query_params;
     query_params.push_back(std::make_pair("mediaFile", media_file));
     query_params.push_back(std::make_pair("mediaType", media_type));
     query_params.push_back(std::make_pair("keySystem", key_system));
     if (src_type == MSE)
       query_params.push_back(std::make_pair("useMSE", "1"));
+    query_params.push_back(std::make_pair("usePrefixedEME", "1"));
     RunMediaTestPage(html_page, query_params, expectation, true);
   }
 
   void RunSimpleEncryptedMediaTest(const std::string& media_file,
                                    const std::string& media_type,
                                    const std::string& key_system,
                                    SrcType src_type) {
     RunEncryptedMediaTest(kDefaultEmePlayer,
                           media_file,
                           media_type,
@@ skipping 66 matching lines @@
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
   RunEncryptedMediaTest(kDefaultEmePlayer,
                         "bear-a_enc-a.webm",
                         kWebMAudioOnly,
                         "com.example.foo",
                         MSE,
                         kEmeNotSupportedError);
 }
 
 }  // namespace content