Index: ppapi/shared_impl/private/net_address_private_impl.h |
diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h |
index 814633b4dff41f9e8bdfeca4aaa59d3a4af7b826..a7867dda9a2e842ad4281a946217ee30cfefcf33 100644 |
--- a/ppapi/shared_impl/private/net_address_private_impl.h |
+++ b/ppapi/shared_impl/private/net_address_private_impl.h |
@@ -8,7 +8,7 @@ |
#include <string> |
#include <vector> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "ppapi/c/pp_stdint.h" |
#include "ppapi/c/ppb_net_address.h" |
#include "ppapi/shared_impl/ppapi_shared_export.h" |
@@ -27,12 +27,12 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl { |
PP_NetAddress_Private* net_addr); |
static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address, |
- uint16 port, |
+ uint16_t port, |
PP_NetAddress_Private* net_addr); |
static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr, |
std::vector<unsigned char>* address, |
- uint16* port); |
+ uint16_t* port); |
static std::string DescribeNetAddress(const PP_NetAddress_Private& addr, |
bool include_port); |