Move PPB_NetAddress out of dev.

ppapi/cpp/dev/tcp_socket_dev.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_CPP_DEV_TCP_SOCKET_DEV_H_
 #define PPAPI_CPP_DEV_TCP_SOCKET_DEV_H_
 
 #include "ppapi/c/dev/ppb_tcp_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"
 
 namespace pp {
 
 class CompletionCallback;
 class InstanceHandle;
 
 /// The <code>TCPSocket_Dev</code> class provides TCP socket operations.
 ///
@@ skipping 35 matching lines @@
   TCPSocket_Dev& operator=(const TCPSocket_Dev& other);
 
   /// Static function for determining whether the browser supports the
   /// <code>PPB_TCPSocket_Dev</code> interface.
   ///
   /// @return true if the interface is available, false otherwise.
   static bool IsAvailable();
 
   /// Connects the socket 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.
   ///
   /// @return An int32_t containing an error code from <code>pp_errors.h</code>,
   /// including (but not limited to):
   /// - <code>PP_ERROR_NOACCESS</code>: the caller doesn't have required
   ///   permissions.
   /// - <code>PP_ERROR_ADDRESS_UNREACHABLE</code>: <code>addr</code> is
   ///   unreachable.
   /// - <code>PP_ERROR_CONNECTION_REFUSED</code>: the connection attempt was
   ///   refused.
   /// - <code>PP_ERROR_CONNECTION_FAILED</code>: the connection attempt failed.
   /// - <code>PP_ERROR_CONNECTION_TIMEDOUT</code>: the connection attempt timed
   ///   out.
-  int32_t Connect(const NetAddress_Dev& addr,
+  int32_t Connect(const NetAddress& addr,
                   const CompletionCallback& callback);
 
   /// Gets the local address of the socket, if it is connected.
   ///
-  /// @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 GetLocalAddress() const;
+  NetAddress GetLocalAddress() const;
 
   /// Gets the remote address of the socket, if it is connected.
   ///
-  /// @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 GetRemoteAddress() const;
+  NetAddress GetRemoteAddress() const;
 
   /// Reads data from the socket. The socket must be connected. It may perform a
   /// partial read.
   ///
   /// <strong>Caveat:</strong> You should be careful about the lifetime of
   /// <code>buffer</code>. Typically you will use a
   /// <code>CompletionCallbackFactory</code> to scope callbacks to the lifetime
   /// of your class. When your class goes out of scope, the callback factory
   /// will not actually cancel the operation, but will rather just skip issuing
   /// the callback on your class. This means that if the underlying
@@ skipping 52 matching lines @@
   ///
   /// @return An int32_t containing an error code from <code>pp_errors.h</code>.
   ////
   int32_t SetOption(PP_TCPSocket_Option_Dev name,
                     const Var& value,
                     const CompletionCallback& callback);
 };
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_DEV_TCP_SOCKET_DEV_H_
+#endif  // PPAPI_CPP_DEV_TCP_SOCKET__DevDEV_H_