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, 18 insertions, 16 deletions

diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc
index d00a0b4..6a7cdcf 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor.cc
@@ -20,7 +20,7 @@ namespace {
 class RegistrationTask : public Task {
  public:
   RegistrationTask(ExtensionsActivityMonitor* monitor,
-                   NotificationRegistrar* registrar)
+                   content::NotificationRegistrar* registrar)
       : monitor_(monitor), registrar_(registrar) {}
   virtual ~RegistrationTask() {}
 
@@ -39,7 +39,7 @@ class RegistrationTask : public Task {
 
  private:
   ExtensionsActivityMonitor* monitor_;
-  NotificationRegistrar* registrar_;
+  content::NotificationRegistrar* registrar_;
   DISALLOW_COPY_AND_ASSIGN(RegistrationTask);
 };
 }  // namespace
@@ -80,13 +80,15 @@ void ExtensionsActivityMonitor::PutRecords(const Records& records) {
   }
 }
 
-void ExtensionsActivityMonitor::Observe(int type,
-                                        const NotificationSource& source,
-                                        const NotificationDetails& details) {
+void ExtensionsActivityMonitor::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   base::AutoLock lock(records_lock_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const Extension* extension = Source<const Extension>(source).ptr();
-  const BookmarksFunction* f = Details<const BookmarksFunction>(details).ptr();
+  const Extension* extension = content::Source<const Extension>(source).ptr();
+  const BookmarksFunction* f =
+      content::Details<const BookmarksFunction>(details).ptr();
   if (f->name() == "bookmarks.update" ||
       f->name() == "bookmarks.move" ||
       f->name() == "bookmarks.create" ||
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.h b/chrome/browser/sync/util/extensions_activity_monitor.h
index 9166b70..0b76ce1 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.h
+++ b/chrome/browser/sync/util/extensions_activity_monitor.h
@@ -10,8 +10,8 @@
 
 #include "base/message_loop.h"
 #include "base/synchronization/lock.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"
 
 namespace browser_sync {
 
@@ -26,7 +26,7 @@ namespace browser_sync {
 //
 // Consider using MessageLoop::DeleteSoon. (Yes, this means if you allocate
 // an ExtensionsActivityMonitor on a thread other than UI, you must 'new' it).
-class ExtensionsActivityMonitor : public NotificationObserver {
+class ExtensionsActivityMonitor : public content::NotificationObserver {
  public:
   // A data record of activity performed by extension |extension_id|.
   struct Record {
@@ -56,16 +56,16 @@ class ExtensionsActivityMonitor : public NotificationObserver {
   // This is done mutually exclusively w.r.t the methods of this class.
   void PutRecords(const Records& records);
 
-  // NotificationObserver implementation.  Called on |ui_loop_|.
+  // content::NotificationObserver implementation.  Called on |ui_loop_|.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
  private:
   Records records_;
   mutable base::Lock records_lock_;
 
   // Used only from UI loop.
-  NotificationRegistrar registrar_;
+  content::NotificationRegistrar registrar_;
 };
 
 }  // namespace browser_sync
diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
index 3631a77..7213af0 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
@@ -48,8 +48,8 @@ class BookmarkAPIEventTask : public Task {
      for (size_t i = 0; i < repeats_; i++) {
        NotificationService::current()->Notify(
            chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
-           Source<Extension>(extension_.get()),
-           Details<const BookmarksFunction>(function_.get()));
+           content::Source<Extension>(extension_.get()),
+           content::Details<const BookmarksFunction>(function_.get()));
      }
      done_->Signal();
    }