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

chrome/browser/ui/webui/media/media_internals_proxy.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 "chrome/browser/ui/webui/media/media_internals_proxy.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_internals.h"
@@ skipping 108 matching lines @@
 
   DictionaryValue* constants = new DictionaryValue();
   constants->Set("eventTypes", net::NetLog::GetEventTypesAsValue());
   constants->Set("eventPhases", event_phases);
 
   return constants;
 }
 
 void MediaInternalsProxy::ObserveMediaInternalsOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  io_thread_->globals()->media.media_internals->AddObserver(this);
+  MediaInternals::GetInstance()->AddObserver(this);
   io_thread_->net_log()->AddThreadSafeObserver(this,
                                                net::NetLog::LOG_ALL_BUT_BYTES);
 }
 
 void MediaInternalsProxy::StopObservingMediaInternalsOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  io_thread_->globals()->media.media_internals->RemoveObserver(this);
+  MediaInternals::GetInstance()->RemoveObserver(this);
   io_thread_->net_log()->RemoveThreadSafeObserver(this);
 }
 
 void MediaInternalsProxy::GetEverythingOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  io_thread_->globals()->media.media_internals->SendEverything();
+  MediaInternals::GetInstance()->SendEverything();
 }
 
 void MediaInternalsProxy::UpdateUIOnUIThread(const string16& update) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Don't forward updates to a destructed UI.
   if (handler_)
     handler_->OnUpdate(update);
 }
 
 void MediaInternalsProxy::AddNetEventOnUIThread(Value* entry) {
@@ skipping 21 matching lines @@
 
 void MediaInternalsProxy::CallJavaScriptFunctionOnUIThread(
     const std::string& function, Value* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<Value> args_value(args);
   std::vector<const Value*> args_vector;
   args_vector.push_back(args_value.get());
   string16 update = content::WebUI::GetJavascriptCall(function, args_vector);
   UpdateUIOnUIThread(update);
 }