Switch to standard integer types in base/.

base/callback_list_unittest.cc

 // Copyright 2013 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.
 
 #include "base/callback_list.h"
 
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace {
 
 class Listener {
  public:
   Listener() : total_(0), scaler_(1) {}
   explicit Listener(int scaler) : total_(0), scaler_(scaler) {}
@@ skipping 307 matching lines @@
 
   // The callback should be signaled exactly once.
   EXPECT_EQ(1, remove_count.value());
   cb_reg.Notify();
   EXPECT_EQ(2, remove_count.value());
   EXPECT_TRUE(cb_reg.empty());
 }
 
 }  // namespace
 }  // namespace base