Clean up a few more unused globals.

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/logging.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/renderer/render_thread.h"
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 // The following must be after widevine_cdm_version.h.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
 #include <gnu/libc-version.h>
 #include "base/version.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/common/encrypted_media_messages_android.h"
 #endif
 
 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";
+const char kAudioWebM[] = "audio/webm";
+const char kVideoWebM[] = "video/webm";
+const char kVorbis[] = "vorbis";
+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";
+#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) {
   bool is_registered = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType(
           pepper_type, &is_registered));
 
   return is_registered;
 }
@@ skipping 191 matching lines @@
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }