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

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/cookie_monster.h"
 
-class AudioManager;
 class CookieSettings;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
 class TransportSecurityPersister;
 class WebKitContext;
 
-namespace media_stream {
-class MediaStreamManager;
-}  // namespace media_stream
-
 namespace net {
 class CookieStore;
 class FraudulentCertificateReporter;
 class HttpTransactionFactory;
 class OriginBoundCertService;
 class ProxyConfigService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityState;
 }  // namespace net
@@ skipping 83 matching lines @@
     ProfileParams();
     ~ProfileParams();
 
     FilePath path;
     bool is_incognito;
     bool clear_local_state_on_exit;
     std::string accept_language;
     std::string accept_charset;
     std::string referrer_charset;
     IOThread* io_thread;
-    AudioManager* audio_manager;
     scoped_refptr<HostContentSettingsMap> host_content_settings_map;
     scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
     scoped_refptr<WebKitContext> webkit_context;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
     DesktopNotificationService* notification_service;
     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
     // We need to initialize the ProxyConfigService from the UI thread
     // because on linux it relies on initializing things through gconf,
@@ skipping 60 matching lines @@
     explicit ResourceContext(ProfileIOData* io_data);
     virtual ~ResourceContext();
 
    private:
     friend class ProfileIOData;
 
     // ResourceContext implementation:
     virtual net::HostResolver* GetHostResolver() OVERRIDE;
     virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
     virtual MediaObserver* GetMediaObserver() OVERRIDE;
-    virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
-    virtual AudioManager* GetAudioManager() OVERRIDE;
 
     void EnsureInitialized();
 
     ProfileIOData* const io_data_;
 
     net::HostResolver* host_resolver_;
     net::URLRequestContext* request_context_;
     MediaObserver* media_observer_;
-    media_stream::MediaStreamManager* media_stream_manager_;
-    AudioManager* audio_manager_;
   };
 
   typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
       AppRequestContextMap;
 
   // --------------------------------------------
   // Virtual interface for subtypes to implement:
   // --------------------------------------------
 
   // Does the actual initialization of the ProfileIOData subtype. Subtypes
@@ skipping 36 matching lines @@
       chrome_url_data_manager_backend_;
   mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
   mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
 
   // Pointed to by ResourceContext.
-  mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   mutable scoped_refptr<CookieSettings> cookie_settings_;
   mutable DesktopNotificationService* notification_service_;
 
   mutable ResourceContext resource_context_;
 
   mutable scoped_ptr<TransportSecurityPersister>
       transport_security_persister_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_