Revert 164120 - content/browser: Move more files into the content namespace.

content/browser/notification_service_impl.h

Index: content/browser/notification_service_impl.h
===================================================================
--- content/browser/notification_service_impl.h	(revision 164121)
+++ content/browser/notification_service_impl.h	(working copy)
@@ -14,8 +14,10 @@
 namespace content {
 class NotificationObserver;
 class NotificationRegistrar;
+}
 
-class CONTENT_EXPORT NotificationServiceImpl : public NotificationService {
+class CONTENT_EXPORT NotificationServiceImpl
+    : public content::NotificationService {
  public:
   static NotificationServiceImpl* current();
 
@@ -24,15 +26,15 @@
   NotificationServiceImpl();
   virtual ~NotificationServiceImpl();
 
-  // NotificationService:
+  // content::NotificationService
   virtual void Notify(int type,
-                      const NotificationSource& source,
-                      const NotificationDetails& details) OVERRIDE;
+                      const content::NotificationSource& source,
+                      const content::NotificationDetails& details) OVERRIDE;
 
  private:
-  friend class NotificationRegistrar;
+  friend class content::NotificationRegistrar;
 
-  typedef ObserverList<NotificationObserver> NotificationObserverList;
+  typedef ObserverList<content::NotificationObserver> NotificationObserverList;
   typedef std::map<uintptr_t, NotificationObserverList*> NotificationSourceMap;
   typedef std::map<int, NotificationSourceMap> NotificationObserverMap;
   typedef std::map<int, int> NotificationObserverCount;
@@ -40,7 +42,7 @@
   // Convenience function to determine whether a source has a
   // NotificationObserverList in the given map;
   static bool HasKey(const NotificationSourceMap& map,
-                     const NotificationSource& source);
+                     const content::NotificationSource& source);
 
   // NOTE: Rather than using this directly, you should use a
   // NotificationRegistrar.
@@ -49,7 +51,7 @@
   // notification is posted.  Observer is a pointer to an object subclassing
   // NotificationObserver to be notified when an event matching the other two
   // parameters is posted to this service.  Type is the type of events to be
-  // notified about (or NOTIFICATION_ALL to receive events of all
+  // notified about (or content::NOTIFICATION_ALL to receive events of all
   // types).
   // Source is a NotificationSource object (created using
   // "Source<classname>(pointer)"), if this observer only wants to
@@ -61,9 +63,8 @@
   // it must be removed for each of those combinations of type and source later.
   //
   // The caller retains ownership of the object pointed to by observer.
-  void AddObserver(NotificationObserver* observer,
-                   int type,
-                   const NotificationSource& source);
+  void AddObserver(content::NotificationObserver* observer,
+                   int type, const content::NotificationSource& source);
 
   // NOTE: Rather than using this directly, you should use a
   // NotificationRegistrar.
@@ -71,9 +72,8 @@
   // Removes the object pointed to by observer from receiving notifications
   // that match type and source.  If no object matching the parameters is
   // currently registered, this method is a no-op.
-  void RemoveObserver(NotificationObserver* observer,
-                      int type,
-                      const NotificationSource& source);
+  void RemoveObserver(content::NotificationObserver* observer,
+                      int type, const content::NotificationSource& source);
 
   // Keeps track of the observers for each type of notification.
   // Until we get a prohibitively large number of notification types,
@@ -89,6 +89,4 @@
   DISALLOW_COPY_AND_ASSIGN(NotificationServiceImpl);
 };
 
-}  // namespace content
-
 #endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_SERVICE_IMPL_H_