Revert of Switch to standard integer types in sandbox/.

sandbox/win/src/policy_low_level_unittest.cc

Index: sandbox/win/src/policy_low_level_unittest.cc
diff --git a/sandbox/win/src/policy_low_level_unittest.cc b/sandbox/win/src/policy_low_level_unittest.cc
index fd67469f79187589046e2d041379062d4ac91d9c..88b9c439bfa993d188382d5f9ff82d04405c05b4 100644
--- a/sandbox/win/src/policy_low_level_unittest.cc
+++ b/sandbox/win/src/policy_low_level_unittest.cc
@@ -1,9 +1,6 @@
 // Copyright (c) 2006-2008 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.
-
-#include <stddef.h>
-#include <stdint.h>
 
 #include "sandbox/win/src/policy_engine_params.h"
 #include "sandbox/win/src/policy_engine_processor.h"
@@ -59,7 +56,7 @@
               CASE_INSENSITIVE));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 2;
+  const uint32 kFakeService = 2;
 
   LowLevelPolicy policyGen(policy);
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
@@ -92,7 +89,7 @@
                                 CASE_SENSITIVE));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 2;
+  const uint32 kFakeService = 2;
   LowLevelPolicy policyGen(policy);
 
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
@@ -130,7 +127,7 @@
                                 CASE_SENSITIVE));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 3;
+  const uint32 kFakeService = 3;
   LowLevelPolicy policyGen(policy);
 
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
@@ -163,7 +160,7 @@
                                 CASE_SENSITIVE));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 3;
+  const uint32 kFakeService = 3;
   LowLevelPolicy policyGen(policy);
 
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
@@ -202,14 +199,14 @@
   EXPECT_TRUE(pr.AddNumberMatch(IF, 1, 24, EQUAL));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 3;
+  const uint32 kFakeService = 3;
   LowLevelPolicy policyGen(policy);
 
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
   EXPECT_TRUE(policyGen.Done());
 
   const wchar_t* filename = NULL;
-  uint32_t access = 0;
+  uint32 access = 0;
   POLPARAMS_BEGIN(eval_params)
     POLPARAM(filename)                // Argument 0
     POLPARAM(access)                  // Argument 1
@@ -251,15 +248,15 @@
   EXPECT_TRUE(pr.AddNumberMatch(IF, 2, 66, EQUAL));
 
   PolicyGlobal* policy = MakePolicyMemory();
-  const uint32_t kFakeService = 3;
+  const uint32 kFakeService = 3;
   LowLevelPolicy policyGen(policy);
 
   EXPECT_TRUE(policyGen.AddRule(kFakeService, &pr));
   EXPECT_TRUE(policyGen.Done());
 
   const wchar_t* filename = NULL;
-  uint32_t access = 0;
-  uint32_t sharing = 66;
+  uint32 access = 0;
+  uint32 sharing = 66;
 
   POLPARAMS_BEGIN(eval_params)
     POLPARAM(filename)                // Argument 0
@@ -325,15 +322,15 @@
 
   PolicyGlobal* policy = MakePolicyMemory();
 
-  const uint32_t kNtFakeCreateFile = 7;
+  const uint32 kNtFakeCreateFile = 7;
 
   LowLevelPolicy policyGen(policy);
   EXPECT_TRUE(policyGen.AddRule(kNtFakeCreateFile, &pr));
   EXPECT_TRUE(policyGen.Done());
 
   const wchar_t* filename = L"c:\\Documents and Settings\\Microsoft\\BLAH.txt";
-  uint32_t creation_mode = OPEN_EXISTING;
-  uint32_t flags = FILE_ATTRIBUTE_NORMAL;
+  uint32 creation_mode = OPEN_EXISTING;
+  uint32 flags = FILE_ATTRIBUTE_NORMAL;
   void* security_descriptor = NULL;
 
   POLPARAMS_BEGIN(eval_params)
@@ -431,9 +428,9 @@
 
   PolicyGlobal* policy = MakePolicyMemory();
 
-  const uint32_t kNtFakeNone = 4;
-  const uint32_t kNtFakeCreateFile = 5;
-  const uint32_t kNtFakeOpenFile = 6;
+  const uint32 kNtFakeNone       = 4;
+  const uint32 kNtFakeCreateFile = 5;
+  const uint32 kNtFakeOpenFile   = 6;
 
   LowLevelPolicy policyGen(policy);
   EXPECT_TRUE(policyGen.AddRule(kNtFakeCreateFile, &pr_pipe));
@@ -489,8 +486,8 @@
   // Test the policy evaluation.
 
   const wchar_t* filename = L"";
-  uint32_t creation_mode = OPEN_EXISTING;
-  uint32_t flags = FILE_ATTRIBUTE_NORMAL;
+  uint32 creation_mode = OPEN_EXISTING;
+  uint32 flags = FILE_ATTRIBUTE_NORMAL;
   void* security_descriptor = NULL;
 
   POLPARAMS_BEGIN(params)