Switch to standard integer types in content/.

content/ppapi_plugin/broker_process_dispatcher.h

Index: content/ppapi_plugin/broker_process_dispatcher.h
diff --git a/content/ppapi_plugin/broker_process_dispatcher.h b/content/ppapi_plugin/broker_process_dispatcher.h
index bbdbfdcc3232d06c2187c7f574a9a8485149326c..9dca6df10b9b790939da71162ec0715223889a13 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.h
+++ b/content/ppapi_plugin/broker_process_dispatcher.h
@@ -5,7 +5,9 @@
 #ifndef CONTENT_PPAPI_PLUGIN_BROKER_PROCESS_DISPATCHER_H_
 #define CONTENT_PPAPI_PLUGIN_BROKER_PROCESS_DISPATCHER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/child/scoped_child_process_reference.h"
 #include "ppapi/c/ppp.h"
@@ -29,36 +31,35 @@ class BrokerProcessDispatcher
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   void OnGetPermissionSettingsCompleted(
-      uint32 request_id,
+      uint32_t request_id,
       bool success,
       PP_Flash_BrowserOperations_Permission default_permission,
       const ppapi::FlashSiteSettings& sites);
 
  private:
-  void OnGetSitesWithData(uint32 request_id,
+  void OnGetSitesWithData(uint32_t request_id,
                           const base::FilePath& plugin_data_path);
-  void OnClearSiteData(uint32 request_id,
+  void OnClearSiteData(uint32_t request_id,
                        const base::FilePath& plugin_data_path,
                        const std::string& site,
-                       uint64 flags,
-                       uint64 max_age);
-  void OnDeauthorizeContentLicenses(uint32 request_id,
+                       uint64_t flags,
+                       uint64_t max_age);
+  void OnDeauthorizeContentLicenses(uint32_t request_id,
                                     const base::FilePath& plugin_data_path);
   void OnGetPermissionSettings(
-      uint32 request_id,
+      uint32_t request_id,
       const base::FilePath& plugin_data_path,
       PP_Flash_BrowserOperations_SettingType setting_type);
   void OnSetDefaultPermission(
-      uint32 request_id,
+      uint32_t request_id,
       const base::FilePath& plugin_data_path,
       PP_Flash_BrowserOperations_SettingType setting_type,
       PP_Flash_BrowserOperations_Permission permission,
       bool clear_site_specific);
-  void OnSetSitePermission(
-      uint32 request_id,
-      const base::FilePath& plugin_data_path,
-      PP_Flash_BrowserOperations_SettingType setting_type,
-      const ppapi::FlashSiteSettings& sites);
+  void OnSetSitePermission(uint32_t request_id,
+                           const base::FilePath& plugin_data_path,
+                           PP_Flash_BrowserOperations_SettingType setting_type,
+                           const ppapi::FlashSiteSettings& sites);
 
   // Returns a list of sites that have data stored.
   void GetSitesWithData(const base::FilePath& plugin_data_path,
@@ -67,8 +68,8 @@ class BrokerProcessDispatcher
   // Requests that the plugin clear data, returning true on success.
   bool ClearSiteData(const base::FilePath& plugin_data_path,
                      const std::string& site,
-                     uint64 flags,
-                     uint64 max_age);
+                     uint64_t flags,
+                     uint64_t max_age);
 
   bool DeauthorizeContentLicenses(const base::FilePath& plugin_data_path);
   bool SetDefaultPermission(const base::FilePath& plugin_data_path,