Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s…

chrome/browser/io_thread.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_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
 
 class ChromeNetLog;
 class ExtensionEventRouterForwarder;
-class MediaInternals;
 class PrefProxyConfigTrackerImpl;
 class PrefService;
 class SystemURLRequestContextGetter;
 
 namespace net {
 class CertVerifier;
 class CookieStore;
 class FtpTransactionFactory;
 class HostResolver;
 class HttpAuthHandlerFactory;
@@ skipping 16 matching lines @@
 //
 // If you are looking to interact with the IO thread (e.g. post tasks
 // to it or check if it is the current thread), see
 // content::BrowserThread.
 class IOThread : public content::BrowserThreadDelegate {
  public:
   struct Globals {
     Globals();
     ~Globals();
 
-    struct MediaGlobals {
-      MediaGlobals();
-      ~MediaGlobals();
-      // MediaInternals singleton used to aggregate media information.
-      scoped_ptr<MediaInternals> media_internals;
-    } media;
-
     // The "system" NetworkDelegate, used for Profile-agnostic network events.
     scoped_ptr<net::NetworkDelegate> system_network_delegate;
     scoped_ptr<net::HostResolver> host_resolver;
     scoped_ptr<net::CertVerifier> cert_verifier;
     // This TransportSecurityState doesn't load or save any state. It's only
     // used to enforce pinning for system requests and will only use built-in
     // pins.
     scoped_ptr<net::TransportSecurityState> transport_security_state;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
@@ skipping 123 matching lines @@
       system_url_request_context_getter_;
 
   net::SdchManager* sdch_manager_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_