Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/ui/webui/media/media_internals_proxy.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/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"
 #include "chrome/browser/ui/webui/media/media_internals_handler.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/public/browser/notification_types.h"
 
 static const int kMediaInternalsProxyEventDelayMilliseconds = 100;
 
 static const net::NetLog::EventType kNetEventTypeFilter[] = {
   net::NetLog::TYPE_DISK_CACHE_ENTRY_IMPL,
   net::NetLog::TYPE_SPARSE_READ,
   net::NetLog::TYPE_SPARSE_WRITE,
   net::NetLog::TYPE_URL_REQUEST_START_JOB,
   net::NetLog::TYPE_HTTP_TRANSACTION_READ_RESPONSE_HEADERS,
 };
 
 MediaInternalsProxy::MediaInternalsProxy()
     : ThreadSafeObserverImpl(net::NetLog::LOG_ALL_BUT_BYTES) {
   io_thread_ = g_browser_process->io_thread();
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void MediaInternalsProxy::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(type, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
   RenderProcessHost* process = content::Source<RenderProcessHost>(source).ptr();
   CallJavaScriptFunctionOnUIThread("media.onRendererTerminated",
       base::Value::CreateIntegerValue(process->id()));
@@ skipping 137 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 = WebUI::GetJavascriptCall(function, args_vector);
   UpdateUIOnUIThread(update);
 }