Switch to standard integer types in sync/.

sync/internal_api/public/test/test_user_share.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
 // UserShare 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 12 matching lines @@
 //
 //   TEST_F(AwesomenessTest, IsMaximal) {
 //     ReadTransaction trans(test_user_share_.user_share());
 //     ...
 //   }
 //
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_
 #define SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/user_share.h"
 
 namespace syncer {
 
 class SyncEncryptionHandler;
 class TestDirectorySetterUpper;
 
 namespace syncable {
 class TestTransactionObserver;
@@ skipping 37 matching lines @@
  private:
   scoped_ptr<TestDirectorySetterUpper> dir_maker_;
   scoped_ptr<UserShare> user_share_;
 
   DISALLOW_COPY_AND_ASSIGN(TestUserShare);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_