projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
media
/
audio
/
sounds
/
sounds_manager.cc
diff --git
a/src/media/audio/sounds/sounds_manager.cc
b/src/media/audio/sounds/sounds_manager.cc
index
df18a95
..
bc86c96
100644
(file)
--- a/
src/media/audio/sounds/sounds_manager.cc
+++ b/
src/media/audio/sounds/sounds_manager.cc
@@
-19,6
+19,7
@@
namespace media {
namespace {
SoundsManager* g_instance = NULL;
namespace {
SoundsManager* g_instance = NULL;
+bool g_initialized_for_testing = false;
// SoundsManagerImpl ---------------------------------------------------
// SoundsManagerImpl ---------------------------------------------------
@@
-123,7
+124,11
@@
SoundsManager::~SoundsManager() { DCHECK(CalledOnValidThread()); }
// static
void SoundsManager::Create() {
// static
void SoundsManager::Create() {
- CHECK(!g_instance) << "SoundsManager::Create() is called twice";
+ CHECK(!g_instance || g_initialized_for_testing)
+ << "SoundsManager::Create() is called twice";
+ if (g_initialized_for_testing)
+ return;
+
const bool enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kDisableSystemSoundsManager);
if (enabled)
const bool enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kDisableSystemSoundsManager);
if (enabled)
@@
-146,4
+151,12
@@
SoundsManager* SoundsManager::Get() {
return g_instance;
}
return g_instance;
}
+// static
+void SoundsManager::InitializeForTesting(SoundsManager* manager) {
+ CHECK(!g_instance) << "SoundsManager is already initialized.";
+ CHECK(manager);
+ g_instance = manager;
+ g_initialized_for_testing = true;
+}
+
} // namespace media
} // namespace media