Move ObserverList to base namespace.

base/observer_list.h

 // 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.
 
 #ifndef BASE_OBSERVER_LIST_H_
 #define BASE_OBSERVER_LIST_H_
 
 #include <algorithm>
 #include <limits>
 #include <vector>
@@ skipping 33 matching lines @@
 //
 //     void NotifyFoo() {
 //       FOR_EACH_OBSERVER(Observer, observer_list_, OnFoo(this));
 //     }
 //
 //     void NotifyBar(int x, int y) {
 //       FOR_EACH_OBSERVER(Observer, observer_list_, OnBar(this, x, y));
 //     }
 //
 //    private:
-//     ObserverList<Observer> observer_list_;
+//     base::ObserverList<Observer> observer_list_;
 //   };
 //
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+namespace base {
+
 template <typename ObserverType>
 class ObserverListThreadSafe;
 
 template <class ObserverType>
 class ObserverListBase
-    : public base::SupportsWeakPtr<ObserverListBase<ObserverType> > {
+    : public SupportsWeakPtr<ObserverListBase<ObserverType>> {
  public:
   // Enumeration of which observers are notified.
   enum NotificationType {
     // Specifies that any observers added during notification are notified.
     // This is the default type if non type is provided to the constructor.
     NOTIFY_ALL,
 
     // Specifies that observers added while sending out notification are not
     // notified.
     NOTIFY_EXISTING_ONLY
   };
 
   // An iterator class that can be used to access the list of observers.  See
   // also the FOR_EACH_OBSERVER macro defined below.
   class Iterator {
    public:
     explicit Iterator(ObserverListBase<ObserverType>* list);
     ~Iterator();
     ObserverType* GetNext();
 
    private:
-    base::WeakPtr<ObserverListBase<ObserverType> > list_;
+    WeakPtr<ObserverListBase<ObserverType>> list_;
     size_t index_;
     size_t max_index_;
   };
 
   ObserverListBase() : notify_depth_(0), type_(NOTIFY_ALL) {}
   explicit ObserverListBase(NotificationType type)
       : notify_depth_(0), type_(type) {}
 
   // Add an observer to the list.  An observer should not be added to
   // the same list more than once.
@@ skipping 127 matching lines @@
   }
 
   bool might_have_observers() const {
     return ObserverListBase<ObserverType>::size() != 0;
   }
 };
 
 #define FOR_EACH_OBSERVER(ObserverType, observer_list, func)             \
   do {                                                                   \
     if ((observer_list).might_have_observers()) {                        \
-      ObserverListBase<ObserverType>::Iterator it_inside_observer_macro( \
+      base::ObserverListBase<ObserverType>::Iterator it_inside_observer_macro( \
           &observer_list);                                               \
       ObserverType* obs;                                                 \
-      while ((obs = it_inside_observer_macro.GetNext()) != nullptr)         \
+      while ((obs = it_inside_observer_macro.GetNext()) != nullptr)      \
         obs->func;                                                       \
     }                                                                    \
   } while (0)
 
+}  // namespace base
+
+// TODO(brettw) remove this when callers use the correct namespace.
+using base::ObserverList;
+
 #endif  // BASE_OBSERVER_LIST_H_