Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

media/audio/audio_manager.cc

 // Copyright (c) 2012 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 "media/audio/audio_manager.h"
 
 #include "base/at_exit.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 
@@ skipping 13 matching lines @@
   g_audio_manager = NULL;
 }
 
 // static
 AudioManager* AudioManager::Create() {
   AudioManager* ret = CreateAudioManager();
   DCHECK(ret == g_audio_manager);
   ret->Init();
   return ret;
 }
+
+// static
+AudioManager* AudioManager::Get() {
+  return g_audio_manager;

[tommi (sloooow) - chröme, 2012/02/21 21:04:08]

See the comment above for g_audio_manager:
" // Used only to make sure we never create more than one instance."

I intend to remove this variable, but if we do this, we start to actually rely
on it again which would be a step backwards.

Fixing this for content_client has actually been on the TODO list though (so
thanks for doing this!) - but what I was planning on doing was to add instead an
audio_manager() property to ContentClient and access it from there.  WDYT?

[jam, 2012/02/21 21:09:47]

got it. I didn't know you were planning on removing it, and so I didn't want to
duplicate this global in both media and content.

I'll remove it from media and move it to content.
Do you mean ContentBrowserClient (ContentClient is an interface that embedders
implement in each process, while CBC is one that's implemented in the browser
process)? If so, then that would take us back to the embedder owning and
creating this object, which is what this change is trying to avoid. I'll look
for a good place to store this in content (usually we store it with the class,
but in this case the class is outside of content)

[tommi (sloooow) - chröme, 2012/02/21 21:15:23]

Yes, ContentBrowserClient.
I see what you mean.  Sounds like a plan.

+}