Switch to standard integer types in sync/.

sync/internal_api/public/util/immutable_unittest.cc

 // 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.
 
 #include "sync/internal_api/public/util/immutable.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <deque>
 #include <list>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 // Helper class that keeps track of the token passed in at
 // construction and how many times that token is copied.
 class TokenCore : public base::RefCounted<TokenCore> {
  public:
   explicit TokenCore(const char* token) : token_(token), copy_count_(0) {}
@@ skipping 209 matching lines @@
       "List");
 }
 
 TEST_F(ImmutableTest, Set) {
   RunTokenContainerTest<std::set<Token>, Immutable<std::set<Token> > >(
       "Set");
 }
 
 }  // namespace
 }  // namespace syncer