Move PPB_TCPSocket out of dev.

ppapi/cpp/tcp_socket.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_
+#ifndef PPAPI_CPP_TCP_SOCKET_H_
+#define PPAPI_CPP_TCP_SOCKET_H_
 
-#include "ppapi/c/dev/ppb_tcp_socket_dev.h"
+#include "ppapi/c/ppb_tcp_socket.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.
+/// The <code>TCPSocket</code> class provides TCP socket operations.
 ///
 /// Permissions: Apps permission <code>socket</code> with subrule
 /// <code>tcp-connect</code> is required for <code>Connect()</code>.
 /// For more details about network communication permissions, please see:
 /// http://developer.chrome.com/apps/app_network.html
-class TCPSocket_Dev: public Resource {
+class TCPSocket : public Resource {
  public:
-  /// Default constructor for creating an is_null() <code>TCPSocket_Dev</code>
+  /// Default constructor for creating an is_null() <code>TCPSocket</code>
   /// object.
-  TCPSocket_Dev();
+  TCPSocket();
 
-  /// A constructor used to create a <code>TCPSocket_Dev</code> object.
+  /// A constructor used to create a <code>TCPSocket</code> object.
   ///
   /// @param[in] instance The instance with which this resource will be
   /// associated.
-  explicit TCPSocket_Dev(const InstanceHandle& instance);
+  explicit TCPSocket(const InstanceHandle& instance);
 
   /// A constructor used when you have received a <code>PP_Resource</code> as a
   /// return value that has had 1 ref added for you.
   ///
-  /// @param[in] resource A <code>PPB_TCPSocket_Dev</code> resource.
-  TCPSocket_Dev(PassRef, PP_Resource resource);
+  /// @param[in] resource A <code>PPB_TCPSocket</code> resource.
+  TCPSocket(PassRef, PP_Resource resource);
 
-  /// The copy constructor for <code>TCPSocket_Dev</code>.
+  /// The copy constructor for <code>TCPSocket</code>.
   ///
-  /// @param[in] other A reference to another <code>TCPSocket_Dev</code>.
-  TCPSocket_Dev(const TCPSocket_Dev& other);
+  /// @param[in] other A reference to another <code>TCPSocket</code>.
+  TCPSocket(const TCPSocket& other);
 
   /// The destructor.
-  virtual ~TCPSocket_Dev();
+  virtual ~TCPSocket();
 
-  /// The assignment operator for <code>TCPSocket_Dev</code>.
+  /// The assignment operator for <code>TCPSocket</code>.
   ///
-  /// @param[in] other A reference to another <code>TCPSocket_Dev</code>.
+  /// @param[in] other A reference to another <code>TCPSocket</code>.
   ///
-  /// @return A reference to this <code>TCPSocket_Dev</code> object.
-  TCPSocket_Dev& operator=(const TCPSocket_Dev& other);
+  /// @return A reference to this <code>TCPSocket</code> object.
+  TCPSocket& operator=(const TCPSocket& other);
 
   /// Static function for determining whether the browser supports the
-  /// <code>PPB_TCPSocket_Dev</code> interface.
+  /// <code>PPB_TCPSocket</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</code> object.
   /// @param[in] callback A <code>CompletionCallback</code> to be called upon
   /// completion.
   ///
@@ skipping 25 matching lines @@
 
   /// 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
-  /// <code>PPB_TCPSocket_Dev</code> resource outlives your class, the browser
+  /// <code>PPB_TCPSocket</code> resource outlives your class, the browser
   /// will still try to write into your buffer when the operation completes.
   /// The buffer must be kept valid until then to avoid memory corruption.
   /// If you want to release the buffer while the <code>Read()</code> call is
   /// still pending, you should call <code>Close()</code> to ensure that the
   /// buffer won't be accessed in the future.
   ///
   /// @param[out] buffer The buffer to store the received data on success. It
   /// must be at least as large as <code>bytes_to_read</code>.
   /// @param[in] bytes_to_read The number of bytes to read.
   /// @param[in] callback A <code>CompletionCallback</code> to be called upon
@@ skipping 24 matching lines @@
   /// pending callbacks will still run, reporting <code>PP_ERROR_ABORTED</code>
   /// if pending IO was interrupted. After a call to this method, no output
   /// buffer pointers passed into previous <code>Read()</code> calls will be
   /// accessed. It is not valid to call <code>Connect()</code> again.
   ///
   /// The socket is implicitly closed if it is destroyed, so you are not
   /// required to call this method.
   void Close();
 
   /// Sets a socket option on the TCP socket.
-  /// Please see the <code>PP_TCPSocket_Option_Dev</code> description for option
+  /// Please see the <code>PP_TCPSocket_Option</code> description for option
   /// names, value types and allowed values.
   ///
   /// @param[in] name The option to set.
   /// @param[in] value The option value to set.
   /// @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>.
   ////
-  int32_t SetOption(PP_TCPSocket_Option_Dev name,
+  int32_t SetOption(PP_TCPSocket_Option name,
                     const Var& value,
                     const CompletionCallback& callback);
 };
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_DEV_TCP_SOCKET__DevDEV_H_
+#endif  // PPAPI_CPP_TCP_SOCKET_H_