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

content/browser/browser_child_process_host.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 "content/browser/browser_child_process_host.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/browser/trace_message_filter.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
 #include "base/synchronization/waitable_event.h"
 #endif  // OS_WIN
 
 namespace {
 
 typedef std::list<BrowserChildProcessHost*> ChildProcessList;
 static base::LazyInstance<ChildProcessList> g_child_process_list(
     base::LINKER_INITIALIZED);
 
 // The NotificationTask is used to notify about plugin process connection/
 // disconnection. It is needed because the notifications in the
 // NotificationService must happen in the main thread.
 class ChildNotificationTask : public Task {
  public:
   ChildNotificationTask(
       int notification_type, ChildProcessInfo* info)
       : notification_type_(notification_type), info_(*info) { }
 
   virtual void Run() {
-    NotificationService::current()->
-        Notify(notification_type_, NotificationService::AllSources(),
+    content::NotificationService::current()->
+        Notify(notification_type_, content::NotificationService::AllSources(),
                content::Details<ChildProcessInfo>(&info_));
   }
 
  private:
   int notification_type_;
   ChildProcessInfo info_;
 };
 
 }  // namespace
 
@@ skipping 187 matching lines @@
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool BrowserChildProcessHost::Iterator::Done() {
   return iterator_ == g_child_process_list.Get().end();
 }