Switch to standard integer types in ui/.

ui/accessibility/ax_tree.h

Index: ui/accessibility/ax_tree.h
diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
index 134ddf6a7822587de5bfae742dc466eb2e64f2df..62b0709fc35aaa9f4d25f0a14c5c71699727e355 100644
--- a/ui/accessibility/ax_tree.h
+++ b/ui/accessibility/ax_tree.h
@@ -5,6 +5,8 @@
 #ifndef UI_ACCESSIBILITY_AX_TREE_H_
 #define UI_ACCESSIBILITY_AX_TREE_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/containers/hash_tables.h"
@@ -103,7 +105,7 @@ class AX_EXPORT AXTree {
   const AXTreeData& data() const { return data_; }
 
   // Returns the AXNode with the given |id| if it is part of this AXTree.
-  AXNode* GetFromId(int32 id) const;
+  AXNode* GetFromId(int32_t id) const;
 
   // Returns true on success. If it returns false, it's a fatal error
   // and this tree should be destroyed, and the source of the tree update
@@ -122,7 +124,7 @@ class AX_EXPORT AXTree {
   int size() { return static_cast<int>(id_map_.size()); }
 
  private:
-  AXNode* CreateNode(AXNode* parent, int32 id, int32 index_in_parent);
+  AXNode* CreateNode(AXNode* parent, int32_t id, int32_t index_in_parent);
 
   // This is called from within Unserialize(), it returns true on success.
   bool UpdateNode(const AXNodeData& src, AXTreeUpdateState* update_state);
@@ -141,7 +143,7 @@ class AX_EXPORT AXTree {
   // child and its subtree if its id is not in |new_child_ids|. Returns
   // true on success, false on fatal error.
   bool DeleteOldChildren(AXNode* node,
-                         const std::vector<int32>& new_child_ids,
+                         const std::vector<int32_t>& new_child_ids,
                          AXTreeUpdateState* update_state);
 
   // Iterate over |new_child_ids| and populate |new_children| with
@@ -150,13 +152,13 @@ class AX_EXPORT AXTree {
   // if the id already exists as the child of another node, that's an
   // error. Returns true on success, false on fatal error.
   bool CreateNewChildVector(AXNode* node,
-                            const std::vector<int32>& new_child_ids,
+                            const std::vector<int32_t>& new_child_ids,
                             std::vector<AXNode*>* new_children,
                             AXTreeUpdateState* update_state);
 
   AXTreeDelegate* delegate_;
   AXNode* root_;
-  base::hash_map<int32, AXNode*> id_map_;
+  base::hash_map<int32_t, AXNode*> id_map_;
   std::string error_;
   AXTreeData data_;
 };