media: Enable SRC content EncryptedMediaTest on Android

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 "build/build_config.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
+#include "media/base/media_switches.h"
 #endif
 
 // Available key systems.
 const char kClearKeyKeySystem[] = "org.w3.clearkey";
 
 // Supported media types.
 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
 
@@ skipping 17 matching lines @@
   if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) {
     VLOG(0) << "MSE is only supported in Android 4.1 and later.";
     return false;
   }
 #endif  // defined(OS_ANDROID)
   return true;
 }
 
 // Tests encrypted media playback with a combination of parameters:
 // - char*: Key system name.
-// - bool: True to load media using MSE, otherwise use src.
+// - bool: True to load media using MSE, otherwise use SRC.

[ddorwin, 2016/03/30 22:13:03]

I think this was referring to .src= rather than the enum value name.

[xhwang, 2016/03/30 22:18:01]

Done.

 class EncryptedMediaTest : public content::MediaBrowserTest,
     public testing::WithParamInterface<std::tr1::tuple<const char*, SrcType> > {
  public:
   // Can only be used in parameterized (*_P) tests.
   const std::string CurrentKeySystem() {
     return std::tr1::get<0>(GetParam());
   }
 
   // Can only be used in parameterized (*_P) tests.
   SrcType CurrentSourceType() {
@@ skipping 60 matching lines @@
   // We want to fail quickly when a test fails because an error is encountered.
   void AddWaitForTitles(content::TitleWatcher* title_watcher) override {
     MediaBrowserTest::AddWaitForTitles(title_watcher);
     title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError));
     title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError));
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
+#if defined(OS_ANDROID)
+    command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline);
+#endif
   }
 };
 
 using ::testing::Combine;
 using ::testing::Values;
 
-#if !defined(OS_ANDROID)
-// Encrypted media playback with SRC is not supported on Android.
 INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
                         Combine(Values(kClearKeyKeySystem), Values(SRC)));
-#endif  // !defined(OS_ANDROID)
 
 INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,
                         Combine(Values(kClearKeyKeySystem), Values(MSE)));
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
   TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) {
   TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo);
@@ skipping 46 matching lines @@
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
   RunEncryptedMediaTest(kDefaultEmePlayer,
                         "bear-a_enc-a.webm",
                         kWebMAudioOnly,
                         "com.example.foo",
                         MSE,
                         kEmeNotSupportedError);
 }
 
 }  // namespace content