Switch to standard integer types in sync/.

sync/internal_api/public/util/immutable.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.
 
 // Immutable<T> provides an easy, cheap, and thread-safe way to pass
 // large immutable data around.
 //
 // For example, consider the following code:
 //
 //  typedef std::vector<LargeObject> LargeObjectList;
@@ skipping 49 matching lines @@
 // NOTE: Some complexity is necessary in order to use Immutable<T>
 // with forward-declared types.  See comments on traits below for
 // details.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_
 #define SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_
 
 // For std::swap().
 #include <algorithm>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 
 namespace syncer {
 
 namespace internal {
 // This class is part of the Immutable implementation.  DO NOT USE
 // THIS CLASS DIRECTLY YOURSELF.
 
 template <typename T, typename Traits>
 class ImmutableCore
@@ skipping 171 matching lines @@
 
 // Helper function to avoid having to write out template arguments.
 template <typename T>
 Immutable<T> MakeImmutable(T* t) {
   return Immutable<T>(t);
 }
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_