Do not run MSE related tests when MSE is not available.

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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/media/media_browsertest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/test/browser_test_utils.h"
+#if defined(OS_ANDROID)
+#include "media/base/android/media_codec_bridge.h"
+#endif
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX)
 #include <gnu/libc-version.h>
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX)
 
 #if defined(ENABLE_PEPPER_CDMS)
 // Platform-specific filename relative to the chrome executable.
 const char kClearKeyCdmAdapterFileName[] =
@@ skipping 65 matching lines @@
       LOG(INFO) << "FrameSizeChange test cannot run with Widevine.";
       return;
     }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
     RunEncryptedMediaTest("encrypted_frame_size_change.html",
                           "frame_size_change-av-enc-v.webm", kWebMAudioVideo,
                           CurrentKeySystem(), CurrentSourceType(), kEnded);
   }
 
   void TestConfigChange() {
+    if (CurrentSourceType() != MSE) {
+      LOG(INFO) << "Skipping test - config change only applies to MSE.";
+      return;
+    }
+
+#if defined(OS_ANDROID)
+    if (!media::MediaCodecBridge::IsAvailable()) {

[ddorwin, 2013/10/16 20:17:17]

As mentioned in PS1, I don't think we should rely on product code for this
decision.

[xhwang, 2013/10/16 21:41:17]

Done.

+      LOG(INFO) << "Could not run test - MSE not supported.";

[ddorwin, 2013/10/16 20:17:17]

An explicit check also allows you to say why here (e.g. pre-JB).

[xhwang, 2013/10/16 21:41:17]

Done.

+      return;
+    }
+#endif  // defined(OS_ANDROID)
+
 #if defined(WIDEVINE_CDM_AVAILABLE)
     if (IsWidevine(CurrentKeySystem())) {
       LOG(INFO) << "ConfigChange test cannot run with Widevine.";
       return;
     }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
+
     std::vector<StringPair> query_params;
     query_params.push_back(std::make_pair("keysystem", CurrentKeySystem()));
     query_params.push_back(std::make_pair("runencrypted", "1"));
     RunMediaTestPage("mse_config_change.html", &query_params, kEnded, true);
   }
 
   void RunEncryptedMediaTest(const char* html_page,
                              const char* media_file,
                              const char* media_type,
                              const char* key_system,
                              SrcType src_type,
                              const char* expectation) {
+#if defined(OS_ANDROID)
+    if (src_type == MSE && !media::MediaCodecBridge::IsAvailable()) {
+      LOG(INFO) << "Could not run test - MSE not supported.";
+      return;
+    }
+#endif  // defined(OS_ANDROID)
+
     std::vector<StringPair> 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"));
     RunMediaTestPage(html_page, &query_params, expectation, true);
   }
 
   void RunSimpleEncryptedMediaTest(const char* media_file,
@@ skipping 172 matching lines @@
 }
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 // The parent key system cannot be used in generateKeyRequest.
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, WVParentThrowsException) {
   RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm",
                         kWebMAudioOnly, "com.widevine", SRC, kEmeGkrException);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)