Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.

This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.

BUG=98716
TBR=joi

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 15 deletions

diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.cc b/chrome/browser/visitedlink/visitedlink_event_listener.cc
index 31be2e9..86c1ddb 100644
--- a/chrome/browser/visitedlink/visitedlink_event_listener.cc
+++ b/chrome/browser/visitedlink/visitedlink_event_listener.cc
@@ -162,12 +162,14 @@ void VisitedLinkEventListener::CommitVisitedLinks() {
   pending_visited_links_.clear();
 }
 
-void VisitedLinkEventListener::Observe(int type,
-                                       const NotificationSource& source,
-                                       const NotificationDetails& details) {
+void VisitedLinkEventListener::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CREATED: {
-      RenderProcessHost* process = Source<RenderProcessHost>(source).ptr();
+      RenderProcessHost* process =
+          content::Source<RenderProcessHost>(source).ptr();
       Profile* profile =
           Profile::FromBrowserContext(process->browser_context());
       if (!profile_->IsSameProfile(profile))
@@ -185,14 +187,16 @@ void VisitedLinkEventListener::Observe(int type,
       break;
     }
     case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: {
-      RenderProcessHost* process = Source<RenderProcessHost>(source).ptr();
+      RenderProcessHost* process =
+          content::Source<RenderProcessHost>(source).ptr();
       if (updaters_.count(process->id())) {
         updaters_.erase(process->id());
       }
       break;
     }
     case content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED: {
-      RenderWidgetHost* widget = Source<RenderWidgetHost>(source).ptr();
+      RenderWidgetHost* widget =
+          content::Source<RenderWidgetHost>(source).ptr();
       int child_id = widget->process()->id();
       if (updaters_.count(child_id))
         updaters_[child_id]->Update();
diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.h b/chrome/browser/visitedlink/visitedlink_event_listener.h
index d491d80..fb2ffb6 100644
--- a/chrome/browser/visitedlink/visitedlink_event_listener.h
+++ b/chrome/browser/visitedlink/visitedlink_event_listener.h
@@ -15,8 +15,8 @@
 #include "base/memory/linked_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 
 class Profile;
 class VisitedLinkUpdater;
@@ -26,7 +26,7 @@ class SharedMemory;
 }
 
 class VisitedLinkEventListener : public VisitedLinkMaster::Listener,
-                                 public NotificationObserver {
+                                 public content::NotificationObserver {
  public:
   explicit VisitedLinkEventListener(Profile* profile);
   virtual ~VisitedLinkEventListener();
@@ -38,15 +38,15 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener,
  private:
   void CommitVisitedLinks();
 
-  // NotificationObserver implementation.
+  // content::NotificationObserver implementation.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
   base::OneShotTimer<VisitedLinkEventListener> coalesce_timer_;
   VisitedLinkCommon::Fingerprints pending_visited_links_;
 
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 
   // Map between renderer child ids and their VisitedLinkUpdater.
   typedef std::map<int, linked_ptr<VisitedLinkUpdater> > Updaters;
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index d34277d..15c48a3 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -501,12 +501,14 @@ class VisitRelayingRenderProcessHost : public BrowserRenderProcessHost {
           : BrowserRenderProcessHost(browser_context) {
     NotificationService::current()->Notify(
         content::NOTIFICATION_RENDERER_PROCESS_CREATED,
-        Source<RenderProcessHost>(this), NotificationService::NoDetails());
+        content::Source<RenderProcessHost>(this),
+        NotificationService::NoDetails());
   }
   virtual ~VisitRelayingRenderProcessHost() {
     NotificationService::current()->Notify(
         content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-        Source<RenderProcessHost>(this), NotificationService::NoDetails());
+        content::Source<RenderProcessHost>(this),
+        NotificationService::NoDetails());
   }
 
   virtual bool Init(bool is_accessibility_enabled) {