Switch to standard integer types in sync/.

sync/engine/conflict_resolver.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.
 //
 // A class that watches the syncer and attempts to resolve any conflicts that
 // occur.
 
 #ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_
 #define SYNC_ENGINE_CONFLICT_RESOLVER_H_
 
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "sync/engine/syncer_types.h"
 
 namespace syncer {
 
 namespace syncable {
 class Id;
 class WriteTransaction;
 }  // namespace syncable
 
 class Cryptographer;
@@ skipping 39 matching lines @@
       const Cryptographer* cryptographer,
       sessions::StatusController* status,
       UpdateCounters* counters);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_CONFLICT_RESOLVER_H_