From e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb Mon Sep 17 00:00:00 2001
From: "rsleevi@chromium.org"
 <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sun, 25 Mar 2012 01:00:54 +0000
Subject: Revert 128789 - Media failures on Win/Mac/Linux starting with this
 CL.

Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to support one.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9845033

TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128797 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/io_thread.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'chrome/browser/io_thread.h')

diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 2cffacf..d651faa 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -21,6 +21,7 @@
 
 class ChromeNetLog;
 class ExtensionEventRouterForwarder;
+class MediaInternals;
 class PrefProxyConfigTrackerImpl;
 class PrefService;
 class SystemURLRequestContextGetter;
@@ -57,6 +58,13 @@ class IOThread : public content::BrowserThreadDelegate {
     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;
-- 
cgit v1.1