Index: media/base/android/media_drm_bridge.cc |
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc |
index 477186cd37c22f3d0f115a328ca44fb06633d111..17f9d389455a237cb88550ab5847f801820149d3 100644 |
--- a/media/base/android/media_drm_bridge.cc |
+++ b/media/base/android/media_drm_bridge.cc |
@@ -14,7 +14,6 @@ |
#include "base/bind.h" |
#include "base/callback_helpers.h" |
#include "base/containers/hash_tables.h" |
-#include "base/lazy_instance.h" |
#include "base/location.h" |
#include "base/logging.h" |
#include "base/macros.h" |
@@ -166,8 +165,10 @@ std::vector<std::string> KeySystemManager::GetPlatformKeySystemNames() { |
return key_systems; |
} |
-base::LazyInstance<KeySystemManager>::Leaky g_key_system_manager = |
- LAZY_INSTANCE_INITIALIZER; |
+KeySystemManager* GetKeySystemManager() { |
+ static KeySystemManager* ksm = new KeySystemManager(); |
+ return ksm; |
+} |
// Checks whether |key_system| is supported with |container_mime_type|. Only |
// checks |key_system| support if |container_mime_type| is empty. |
@@ -183,7 +184,7 @@ bool IsKeySystemSupportedWithTypeImpl(const std::string& key_system, |
return false; |
} |
- UUID scheme_uuid = g_key_system_manager.Get().GetUUID(key_system); |
+ UUID scheme_uuid = GetKeySystemManager()->GetUUID(key_system); |
if (scheme_uuid.empty()) |
return false; |
@@ -275,7 +276,7 @@ std::vector<std::string> MediaDrmBridge::GetPlatformKeySystemNames() { |
if (!MediaDrmBridge::IsAvailable()) |
return std::vector<std::string>(); |
- return g_key_system_manager.Get().GetPlatformKeySystemNames(); |
+ return GetKeySystemManager()->GetPlatformKeySystemNames(); |
} |
// static |
@@ -290,7 +291,7 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateInternal( |
// All paths requires the MediaDrmApis. |
DCHECK(AreMediaDrmApisAvailable()); |
- UUID scheme_uuid = g_key_system_manager.Get().GetUUID(key_system); |
+ UUID scheme_uuid = GetKeySystemManager()->GetUUID(key_system); |
if (scheme_uuid.empty()) |
return nullptr; |