Define proprietary_codecs=1 when branding==Chrome.

content/renderer/media/crypto/key_systems_unittest.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 <string>
 #include <vector>
 
 #include "content/renderer/media/crypto/key_systems.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && \
     defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include <gnu/libc-version.h>
 #endif
 
 using WebKit::WebString;
 
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 #define EXPECT_PROPRIETARY EXPECT_TRUE
 #else
 #define EXPECT_PROPRIETARY EXPECT_FALSE
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // TODO(ddorwin): Remove after bots switch to Precise.
 #define EXPECT_WV(a) \
     EXPECT_EQ((std::string(gnu_get_libc_version()) != "2.11.1"), (a))
@@ skipping 730 matching lines @@
 }
 
 TEST_F(KeySystemsTest, GetUUID_Unrecognized) {
   EXPECT_TRUE(GetUUID(kWidevine).empty());
   EXPECT_TRUE(GetUUID(kClearKey).empty());
   EXPECT_TRUE(GetUUID("").empty());
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content