Remove the AudioManager singleton.

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2011 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/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 478 matching lines @@
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
   DCHECK(set_protocol);
 #if defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD)
   // Install the GView request interceptor that will redirect requests
   // of compatible documents (PDF, etc) to the GView document viewer.
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(switches::kEnableGView))
     job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor);
 #endif  // defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD)
 
-  media_stream_manager_.reset(new media_stream::MediaStreamManager);
+  media_stream_manager_.reset(
+      new media_stream::MediaStreamManager(g_browser_process->audio_manager()));

[willchan no longer on Chromium, 2011/12/10 00:27:33]

Can you make audio_manager get passed in on the UI thread? There's actually a
small race since g_browser_process is a UI thread object and we're accessing it
on the IO thread. If the process shutdown immediately, it's actually
theoretically possible for this to be a use after free.

Also, I like to push use of globals as close to main() as possible, and pass
them into code.

[tommi (sloooow) - chröme, 2011/12/10 09:59:57]

Just so that I understand - do you mean that g_browser_process might possibly be
invalid or that the audio manager might be used after BrowserProcessImpl
releases its reference?

What I'll do then is to fetch the audio_manager inside InitializeOnUIThread and
pass it to here via profile_params_.  Sounds reasonable?
Is there perhaps a better way to share an object across more than one
ResourceContext instances than to keep it with BrowserProcessImpl?  If there is,
I can move the audio manager's home when I make the change to not have the audio
manager ref counted.

[willchan no longer on Chromium, 2011/12/12 16:44:05]

Sounds great and your change looks great to me.

 
   // Take ownership over these parameters.
   database_tracker_ = profile_params_->database_tracker;
   appcache_service_ = profile_params_->appcache_service;
   blob_storage_context_ = profile_params_->blob_storage_context;
   file_system_context_ = profile_params_->file_system_context;
   quota_manager_ = profile_params_->quota_manager;
   host_zoom_map_ = profile_params_->host_zoom_map;
   host_content_settings_map_ = profile_params_->host_content_settings_map;
   cookie_settings_ = profile_params_->cookie_settings;
   notification_service_ = profile_params_->notification_service;
   extension_info_map_ = profile_params_->extension_info_map;
 
   resource_context_.set_host_resolver(io_thread_globals->host_resolver.get());
   resource_context_.set_request_context(main_request_context_);
   resource_context_.set_database_tracker(database_tracker_);
   resource_context_.set_appcache_service(appcache_service_);
   resource_context_.set_blob_storage_context(blob_storage_context_);
   resource_context_.set_file_system_context(file_system_context_);
   resource_context_.set_quota_manager(quota_manager_);
   resource_context_.set_host_zoom_map(host_zoom_map_);
   resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
   resource_context_.set_media_observer(
       io_thread_globals->media.media_internals.get());
   resource_context_.set_download_id_factory(download_id_factory_);
   resource_context_.set_media_stream_manager(media_stream_manager_.get());
+  resource_context_.set_audio_manager(g_browser_process->audio_manager());
 
   LazyInitializeInternal(profile_params_.get());
 
   profile_params_.reset();
   initialized_ = true;
 }
 
 void ProfileIOData::ApplyProfileParamsToContext(
     ChromeURLRequestContext* context) const {
   context->set_is_incognito(profile_params_->is_incognito);
@@ skipping 21 matching lines @@
   bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                         new DeleteTask<ProfileIOData>(this));
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_origin_bound_cert_service(
     net::OriginBoundCertService* origin_bound_cert_service) const {
   origin_bound_cert_service_.reset(origin_bound_cert_service);
 }