Switch to standard integer types in content/browser/.

content/browser/accessibility/accessibility_win_browsertest.cc

Index: content/browser/accessibility/accessibility_win_browsertest.cc
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc
index a28a06b4cb831c42b6c4b4d806307e6baca95838..e70b82f776838e43bc38e2a49b913862a1de0ad8 100644
--- a/content/browser/accessibility/accessibility_win_browsertest.cc
+++ b/content/browser/accessibility/accessibility_win_browsertest.cc
@@ -2,8 +2,12 @@
 // 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 <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
@@ -66,9 +70,9 @@ class AccessibilityWinBrowserTest : public ContentBrowserTest {
   static HRESULT QueryIAccessible2(IAccessible* accessible,
                                    IAccessible2** accessible2);
   static void FindNodeInAccessibilityTree(IAccessible* node,
-                                          int32 expected_role,
+                                          int32_t expected_role,
                                           const std::wstring& expected_name,
-                                          int32 depth,
+                                          int32_t depth,
                                           bool* found);
   static void CheckTextAtOffset(
       base::win::ScopedComPtr<IAccessibleText>& element,
@@ -260,9 +264,9 @@ HRESULT AccessibilityWinBrowserTest::QueryIAccessible2(
 // and name.
 void AccessibilityWinBrowserTest::FindNodeInAccessibilityTree(
     IAccessible* node,
-    int32 expected_role,
+    int32_t expected_role,
     const std::wstring& expected_name,
-    int32 depth,
+    int32_t depth,
     bool* found) {
   base::win::ScopedBstr name_bstr;
   base::win::ScopedVariant childid_self(CHILDID_SELF);
@@ -358,15 +362,15 @@ class AccessibilityWinBrowserTest::AccessibleChecker {
   // This constructor can be used if the IA2 role will be the same as the MSAA
   // role.
   AccessibleChecker(const std::wstring& expected_name,
-                    int32 expected_role,
+                    int32_t expected_role,
                     const std::wstring& expected_value);
   AccessibleChecker(const std::wstring& expected_name,
-                    int32 expected_role,
-                    int32 expected_ia2_role,
+                    int32_t expected_role,
+                    int32_t expected_ia2_role,
                     const std::wstring& expected_value);
   AccessibleChecker(const std::wstring& expected_name,
                     const std::wstring& expected_role,
-                    int32 expected_ia2_role,
+                    int32_t expected_ia2_role,
                     const std::wstring& expected_value);
 
   // Append an AccessibleChecker that verifies accessibility information for
@@ -402,7 +406,7 @@ class AccessibilityWinBrowserTest::AccessibleChecker {
   base::win::ScopedVariant role_;
 
   // Expected IAccessible2 role. Checked against IAccessible2::role.
-  int32 ia2_role_;
+  int32_t ia2_role_;
 
   // Expected accessible value. Checked against IAccessible::get_accValue.
   std::wstring value_;
@@ -417,38 +421,35 @@ class AccessibilityWinBrowserTest::AccessibleChecker {
 
 AccessibilityWinBrowserTest::AccessibleChecker::AccessibleChecker(
     const std::wstring& expected_name,
-    int32 expected_role,
+    int32_t expected_role,
     const std::wstring& expected_value)
     : name_(expected_name),
       role_(expected_role),
       ia2_role_(expected_role),
       value_(expected_value),
-      state_(-1) {
-}
+      state_(-1) {}
 
 AccessibilityWinBrowserTest::AccessibleChecker::AccessibleChecker(
     const std::wstring& expected_name,
-    int32 expected_role,
-    int32 expected_ia2_role,
+    int32_t expected_role,
+    int32_t expected_ia2_role,
     const std::wstring& expected_value)
     : name_(expected_name),
       role_(expected_role),
       ia2_role_(expected_ia2_role),
       value_(expected_value),
-      state_(-1) {
-}
+      state_(-1) {}
 
 AccessibilityWinBrowserTest::AccessibleChecker::AccessibleChecker(
     const std::wstring& expected_name,
     const std::wstring& expected_role,
-    int32 expected_ia2_role,
+    int32_t expected_ia2_role,
     const std::wstring& expected_value)
     : name_(expected_name),
       role_(expected_role.c_str()),
       ia2_role_(expected_ia2_role),
       value_(expected_value),
-      state_(-1) {
-}
+      state_(-1) {}
 
 void AccessibilityWinBrowserTest::AccessibleChecker::AppendExpectedChild(
     AccessibleChecker* expected_child) {