Revert of Switch to standard integer types in sandbox/.

sandbox/win/src/service_resolver_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.
 
 // This file contains unit tests for ServiceResolverThunk.
 
-#include <stddef.h>
-
-#include "base/macros.h"
+#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/windows_version.h"
 #include "sandbox/win/src/resolver.h"
 #include "sandbox/win/src/sandbox_utils.h"
 #include "sandbox/win/src/service_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // This is the concrete resolver used to perform service-call type functions
@@ skipping 238 matching lines @@
 
   // Now allow local patches and check that things work.
   resolver->AllowLocalPatches();
   ret = resolver->Setup(ntdll_base, NULL, kFunctionName, NULL,
                         function_entry, thunk.get(), thunk_size,
                         &used);
   EXPECT_EQ(STATUS_SUCCESS, ret);
 }
 
 }  // namespace