Index: ppapi/cpp/dev/udp_socket_dev.h |
diff --git a/ppapi/cpp/dev/udp_socket_dev.h b/ppapi/cpp/dev/udp_socket_dev.h |
index 97129e2eff66c2382483846c7819378f62c485d2..21e6c45c7f09b2781969f7e8132aaf760394b5ca 100644 |
--- a/ppapi/cpp/dev/udp_socket_dev.h |
+++ b/ppapi/cpp/dev/udp_socket_dev.h |
@@ -6,7 +6,7 @@ |
#define PPAPI_CPP_DEV_UDP_SOCKET_DEV_H_ |
#include "ppapi/c/dev/ppb_udp_socket_dev.h" |
-#include "ppapi/cpp/dev/net_address_dev.h" |
+#include "ppapi/cpp/net_address.h" |
#include "ppapi/cpp/pass_ref.h" |
#include "ppapi/cpp/resource.h" |
@@ -66,7 +66,7 @@ class UDPSocket_Dev: public Resource { |
/// Binds to the given address. |
/// |
- /// @param[in] addr A <code>NetAddress_Dev</code> object. |
+ /// @param[in] addr A <code>NetAddress</code> object. |
/// @param[in] callback A <code>CompletionCallback</code> to be called upon |
/// completion. |
/// |
@@ -74,15 +74,15 @@ class UDPSocket_Dev: public Resource { |
/// <code>PP_ERROR_NOACCESS</code> will be returned if the caller doesn't have |
/// required permissions. <code>PP_ERROR_ADDRESS_IN_USE</code> will be |
/// returned if the address is already in use. |
- int32_t Bind(const NetAddress_Dev& addr, |
+ int32_t Bind(const NetAddress& addr, |
const CompletionCallback& callback); |
/// Get the address that the socket has bound to. It can only be called after |
/// a successful <code>Bind()</code> call. |
/// |
- /// @return A <code>NetAddress_Dev</code> object. The object will be null |
+ /// @return A <code>NetAddress</code> object. The object will be null |
/// (i.e., is_null() returns true) on failure. |
- NetAddress_Dev GetBoundAddress(); |
+ NetAddress GetBoundAddress(); |
/// Receives data from the socket and stores the source address. It can only |
/// be called after a successful <code>Bind()</code> call. |
@@ -111,15 +111,15 @@ class UDPSocket_Dev: public Resource { |
int32_t RecvFrom( |
char* buffer, |
int32_t num_bytes, |
- const CompletionCallbackWithOutput<NetAddress_Dev>& callback); |
+ const CompletionCallbackWithOutput<NetAddress>& callback); |
/// Sends data to a specific destination. It can only be called after a |
/// successful <code>Bind()</code> call. |
/// |
/// @param[in] buffer The buffer containing the data to send. |
/// @param[in] num_bytes The number of bytes to send. |
- /// @param[in] addr A <code>NetAddress_Dev</code> object holding the |
- /// target address. |
+ /// @param[in] addr A <code>NetAddress</code> object holding the target |
+ /// address. |
/// @param[in] callback A <code>CompletionCallback</code> to be called upon |
/// completion. |
/// |
@@ -129,7 +129,7 @@ class UDPSocket_Dev: public Resource { |
/// required permissions. |
int32_t SendTo(const char* buffer, |
int32_t num_bytes, |
- const NetAddress_Dev& addr, |
+ const NetAddress& addr, |
const CompletionCallback& callback); |
/// Cancels all pending reads and writes, and closes the socket. Any pending |