Move PPB_NetAddress out of dev.

ppapi/shared_impl/private/net_address_private_impl.h

 // Copyright (c) 2011 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_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_
 #define PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ppapi/c/dev/ppb_net_address_dev.h"
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/ppb_net_address.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 struct PP_NetAddress_Private;
 struct sockaddr;
 
 namespace ppapi {
 
 class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
  public:
   static bool ValidateNetAddress(const PP_NetAddress_Private& addr);
 
   static bool SockaddrToNetAddress(const sockaddr* sa,
                                    uint32_t sa_length,
                                    PP_NetAddress_Private* net_addr);
 
   static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address,
                                      int port,
                                      PP_NetAddress_Private* net_addr);
 
   static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr,
                                      std::vector<unsigned char>* address,
                                      int* port);
 
   static std::string DescribeNetAddress(const PP_NetAddress_Private& addr,
                                         bool include_port);
 
-  // Conversion methods to make PPB_NetAddress_Dev resource work with
+  // Conversion methods to make PPB_NetAddress resource work with
   // PP_NetAddress_Private.
-  // TODO(yzshen): Remove them once PPB_NetAddress_Dev resource doesn't use
+  // TODO(yzshen): Remove them once PPB_NetAddress resource doesn't use
   // PP_NetAddress_Private as storage type.
   static void CreateNetAddressPrivateFromIPv4Address(
-      const PP_NetAddress_IPv4_Dev& ipv4_addr,
+      const PP_NetAddress_IPv4& ipv4_addr,
       PP_NetAddress_Private* addr);
   static void CreateNetAddressPrivateFromIPv6Address(
-      const PP_NetAddress_IPv6_Dev& ipv6_addr,
+      const PP_NetAddress_IPv6& ipv6_addr,
       PP_NetAddress_Private* addr);
-  static PP_NetAddress_Family_Dev GetFamilyFromNetAddressPrivate(
+  static PP_NetAddress_Family GetFamilyFromNetAddressPrivate(
       const PP_NetAddress_Private& addr);
   static bool DescribeNetAddressPrivateAsIPv4Address(
       const PP_NetAddress_Private& addr,
-      PP_NetAddress_IPv4_Dev* ipv4_addr);
+      PP_NetAddress_IPv4* ipv4_addr);
   static bool DescribeNetAddressPrivateAsIPv6Address(
       const PP_NetAddress_Private& addr,
-      PP_NetAddress_IPv6_Dev* ipv6_addr);
+      PP_NetAddress_IPv6* ipv6_addr);
 
   static const PP_NetAddress_Private kInvalidNetAddress;
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(NetAddressPrivateImpl);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_