Move PPB_TCPSocket out of dev.

ppapi/shared_impl/tcp_socket_shared.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_SHARED_IMPL_TCP_SOCKET_SHARED_H_
 #define PPAPI_SHARED_IMPL_TCP_SOCKET_SHARED_H_
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "ppapi/c/dev/ppb_tcp_socket_dev.h"
+#include "ppapi/c/ppb_tcp_socket.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 
 namespace ppapi {
 
 class PPB_X509Certificate_Fields;
 class PPB_X509Certificate_Private_Shared;
 class SocketOptionData;
 
@@ skipping 35 matching lines @@
   virtual void SendConnect(const std::string& host, uint16_t port) = 0;
   virtual void SendConnectWithNetAddress(const PP_NetAddress_Private& addr) = 0;
   virtual void SendSSLHandshake(
       const std::string& server_name,
       uint16_t server_port,
       const std::vector<std::vector<char> >& trusted_certs,
       const std::vector<std::vector<char> >& untrusted_certs) = 0;
   virtual void SendRead(int32_t bytes_to_read) = 0;
   virtual void SendWrite(const std::string& buffer) = 0;
   virtual void SendDisconnect() = 0;
-  virtual void SendSetOption(PP_TCPSocket_Option_Dev name,
+  virtual void SendSetOption(PP_TCPSocket_Option name,
                              const SocketOptionData& value) = 0;
 
   virtual Resource* GetOwnerResource() = 0;
 
   // Used to override PP_Error codes received from the browser side.
   virtual int32_t OverridePPError(int32_t pp_error);
 
  protected:
   enum ConnectionState {
     // Before a connection is successfully established (including a connect
@@ skipping 24 matching lines @@
   PP_Resource GetServerCertificateImpl();
   PP_Bool AddChainBuildingCertificateImpl(PP_Resource certificate,
                                           PP_Bool trusted);
   int32_t ReadImpl(char* buffer,
                    int32_t bytes_to_read,
                    scoped_refptr<TrackedCallback> callback);
   int32_t WriteImpl(const char* buffer,
                     int32_t bytes_to_write,
                     scoped_refptr<TrackedCallback> callback);
   void DisconnectImpl();
-  int32_t SetOptionImpl(PP_TCPSocket_Option_Dev name,
+  int32_t SetOptionImpl(PP_TCPSocket_Option name,
                         const PP_Var& value,
                         scoped_refptr<TrackedCallback> callback);
 
   void Init(uint32 socket_id);
   bool IsConnected() const;
   void PostAbortIfNecessary(scoped_refptr<TrackedCallback>* callback);
 
   ResourceObjectType resource_type_;
 
   uint32 socket_id_;
@@ skipping 16 matching lines @@
   std::vector<std::vector<char> > trusted_certificates_;
   std::vector<std::vector<char> > untrusted_certificates_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TCPSocketShared);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_TCP_SOCKET_SHARED_H_