mac: Fix build with ffmpeg_branding=Chrome proprietary_codecs=1.

chrome/renderer/media/chrome_key_systems.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 "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 
 const char kAudioWebM[] = "audio/webm";
 const char kVideoWebM[] = "video/webm";
 const char kVorbis[] = "vorbis";
 const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
 
 #if defined(USE_PROPRIETARY_CODECS)
 const char kAudioMp4[] = "audio/mp4";
 const char kVideoMp4[] = "video/mp4";
 const char kMp4a[] = "mp4a";
+#if defined(WIDEVINE_CDM_AVAILABLE)
 const char kAvc1Avc3[] = "avc1,avc3";

[acolwell GONE FROM CHROMIUM, 2013/10/18 21:41:18]

nit: How about just moving this into the #ifdef below w/ the other Widevine
specific constants and enums.

[Nico, 2013/10/18 21:43:12]

Done.

[Nico, 2013/10/18 21:43:12]

Does that change much? Down there it'd have to be wrapped in #if
defined(USE_PROPRIETARY_CODECS), right? Here's at least next to the other const
char[]s.

[acolwell GONE FROM CHROMIUM, 2013/10/18 21:45:55]

Oh right. How about just inlining this since it isn't actually being reused
anywhere? Otherwise I'm fine with this as is.

+#endif  // WIDEVINE_CDM_AVAILABLE
 const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3";
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmRegistered(const std::string& pepper_type) {
   bool is_registered = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType(
           pepper_type, &is_registered));
 
@@ skipping 200 matching lines @@
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableMediaDrm))
     AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }