Switch to standard integer types in sync/.

sync/test/engine/test_directory_setter_upper.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 handy class that takes care of setting up and destroying a
 // syncable::Directory instance for unit tests that require one.
 //
 // The expected usage is to make this a component of your test fixture:
 //
 //   class AwesomenessTest : public testing::Test {
@@ skipping 13 matching lines @@
 //   TEST_F(AwesomenessTest, IsMaximal) {
 //     ... now use metadb_.directory() to get at syncable::Entry objects ...
 //   }
 //
 
 #ifndef SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
 #define SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "sync/test/fake_sync_encryption_handler.h"
 #include "sync/test/null_directory_change_delegate.h"
 #include "sync/util/test_unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
 
 namespace syncable {
 class Directory;
@@ skipping 37 matching lines @@
   FakeSyncEncryptionHandler encryption_handler_;
   scoped_ptr<syncable::Directory> directory_;
   std::string name_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_