Define proprietary_codecs=1 when branding==Chrome.

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/path_service.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"
@@ skipping 225 matching lines @@
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
   // Times out on Windows XP. http://crbug.com/171937
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
 #endif
   TestFrameSizeChange(GetParam(), kEnded);
 }
 
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4) {
   std::tr1::tuple<const char*, SrcType> test_params = GetParam();
   // MP4 without MSE is not support yet, http://crbug.com/170793.
   if (std::tr1::get<1>(test_params) != MSE) {
     LOG(INFO) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
     return;
   }
   TestMSESimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly,
                         std::tr1::get<0>(test_params), kEnded);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) {
   std::tr1::tuple<const char*, SrcType> test_params = GetParam();
   // MP4 without MSE is not support yet, http://crbug.com/170793.
   if (std::tr1::get<1>(test_params) != MSE) {
     LOG(INFO) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
     return;
   }
   TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly,
                         std::tr1::get<0>(test_params), kEnded);
 }
-#endif
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 // Run only when WV CDM is available.
 #if defined(WIDEVINE_CDM_AVAILABLE)
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_WebM) {
   TestMSESimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly,
                         kWidevineKeySystem);
 }
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioClearVideo_WebM) {
   TestMSESimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo,
                         kWidevineKeySystem);
 }
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_VideoAudio_WebM) {
   TestMSESimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
                         kWidevineKeySystem);
 }
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_VideoOnly_WebM) {
   TestMSESimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly,
                         kWidevineKeySystem);
 }
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_VideoClearAudio_WebM) {
   TestMSESimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,
                         kWidevineKeySystem);
 }
 
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_VideoOnly_MP4) {
   TestMSESimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly,
                         kWidevineKeySystem);
 }
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) {
   TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly,
                         kWidevineKeySystem);
 }
-#endif  // defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 }  // namespace content