Switch to standard integer types in base/.

base/scoped_observer.h

 // Copyright (c) 2012 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_SCOPED_OBSERVER_H_
 #define BASE_SCOPED_OBSERVER_H_
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 
 // ScopedObserver is used to keep track of the set of sources an object has
 // attached itself to as an observer. When ScopedObserver is destroyed it
 // removes the object as an observer from all sources it has been added to.
 template <class Source, class Observer>
 class ScopedObserver {
  public:
   explicit ScopedObserver(Observer* observer) : observer_(observer) {}
 
@@ skipping 29 matching lines @@
 
  private:
   Observer* observer_;
 
   std::vector<Source*> sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedObserver);
 };
 
 #endif  // BASE_SCOPED_OBSERVER_H_