Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Unified Diff: media/base/android/media_drm_bridge.cc

Issue 2668813002: Remove LazyInstance usage from media/ (Closed)
Patch Set: Fix new LazyInstance. Add PRESUBMIT. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a47a00d4e678326c63dd15a3bac43ff3a08aa757..bc35e3617778ff0be7baa39f8012d84322f76b90 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -15,7 +15,6 @@
#include "base/callback_helpers.h"
#include "base/containers/hash_tables.h"
#include "base/feature_list.h"
-#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -168,8 +167,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.
@@ -185,7 +186,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;
@@ -291,7 +292,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
@@ -306,7 +307,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;

Powered by Google App Engine
This is Rietveld 408576698