Clean up a few more unused globals.

chrome/renderer/media/chrome_key_systems.cc

Index: chrome/renderer/media/chrome_key_systems.cc
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index 173fd046d55aca2d33b57a5d5cc9d24f43dcbe3a..c12a3ed6621c4f3176464af17dc8b145680416c8 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -25,16 +25,18 @@
 
 using content::KeySystemInfo;
 
-static const char kAudioWebM[] = "audio/webm";
-static const char kVideoWebM[] = "video/webm";
-static const char kVorbis[] = "vorbis";
-static const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
-
-static const char kAudioMp4[] = "audio/mp4";
-static const char kVideoMp4[] = "video/mp4";
-static const char kMp4a[] = "mp4a";
-static const char kAvc1[] = "avc1";
-static const char kMp4aAvc1[] = "mp4a,avc1";
+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";
+const char kAvc1[] = "avc1";
+const char kMp4aAvc1[] = "mp4a,avc1";
+#endif  // defined(USE_PROPRIETARY_CODECS)

[xhwang, 2013/09/25 21:16:52]

Are dropping "static" because it's static by default? At lease in media/ code we
still specify "static" all over the place. Shall the "be consistent with
existing code" rule apply here?

[Nico, 2013/09/25 21:19:41]

Yes.
I can revert it if you want, but I think there's value in global consistency in
the chromium codebase too. Your call.

[xhwang, 2013/09/25 21:21:33]

sgtm if the chromium codebase is already doing this. We'll convert media/ to
chromium style gradually.

 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmRegistered(const std::string& pepper_type) {