Move PPB_NetAddress out of dev.

ppapi/thunk/ppb_net_address_thunk.cc

Index: ppapi/thunk/ppb_net_address_thunk.cc
diff --git a/ppapi/thunk/ppb_net_address_dev_thunk.cc b/ppapi/thunk/ppb_net_address_thunk.cc
similarity index 67%
rename from ppapi/thunk/ppb_net_address_dev_thunk.cc
rename to ppapi/thunk/ppb_net_address_thunk.cc
index 9f0e5088f61fb09cc088c180cfded11f6cda3bbc..f8916fe9716c86adaa56b4a425b3bac33ae46e4f 100644
--- a/ppapi/thunk/ppb_net_address_dev_thunk.cc
+++ b/ppapi/thunk/ppb_net_address_thunk.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/ppb_net_address_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_net_address.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_instance_api.h"
@@ -18,8 +18,8 @@ namespace {
 
 PP_Resource CreateFromIPv4Address(
     PP_Instance instance,
-    const struct PP_NetAddress_IPv4_Dev* ipv4_addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::CreateFromIPv4Address()";
+    const struct PP_NetAddress_IPv4* ipv4_addr) {
+  VLOG(4) << "PPB_NetAddress::CreateFromIPv4Address()";
   EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
@@ -29,8 +29,8 @@ PP_Resource CreateFromIPv4Address(
 
 PP_Resource CreateFromIPv6Address(
     PP_Instance instance,
-    const struct PP_NetAddress_IPv6_Dev* ipv6_addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::CreateFromIPv6Address()";
+    const struct PP_NetAddress_IPv6* ipv6_addr) {
+  VLOG(4) << "PPB_NetAddress::CreateFromIPv6Address()";
   EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
@@ -38,14 +38,14 @@ PP_Resource CreateFromIPv6Address(
                                                             ipv6_addr);
 }
 
-PP_Bool IsNetAddress(PP_Resource addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::IsNetAddress()";
-  EnterResource<PPB_NetAddress_API> enter(addr, false);
+PP_Bool IsNetAddress(PP_Resource resource) {
+  VLOG(4) << "PPB_NetAddress::IsNetAddress()";
+  EnterResource<PPB_NetAddress_API> enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
-PP_NetAddress_Family_Dev GetFamily(PP_Resource addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::GetFamily()";
+PP_NetAddress_Family GetFamily(PP_Resource addr) {
+  VLOG(4) << "PPB_NetAddress::GetFamily()";
   EnterResource<PPB_NetAddress_API> enter(addr, true);
   if (enter.failed())
     return PP_NETADDRESS_FAMILY_UNSPECIFIED;
@@ -53,7 +53,7 @@ PP_NetAddress_Family_Dev GetFamily(PP_Resource addr) {
 }
 
 struct PP_Var DescribeAsString(PP_Resource addr, PP_Bool include_port) {
-  VLOG(4) << "PPB_NetAddress_Dev::DescribeAsString()";
+  VLOG(4) << "PPB_NetAddress::DescribeAsString()";
   EnterResource<PPB_NetAddress_API> enter(addr, true);
   if (enter.failed())
     return PP_MakeUndefined();
@@ -61,8 +61,8 @@ struct PP_Var DescribeAsString(PP_Resource addr, PP_Bool include_port) {
 }
 
 PP_Bool DescribeAsIPv4Address(PP_Resource addr,
-                              struct PP_NetAddress_IPv4_Dev* ipv4_addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::DescribeAsIPv4Address()";
+                              struct PP_NetAddress_IPv4* ipv4_addr) {
+  VLOG(4) << "PPB_NetAddress::DescribeAsIPv4Address()";
   EnterResource<PPB_NetAddress_API> enter(addr, true);
   if (enter.failed())
     return PP_FALSE;
@@ -70,15 +70,15 @@ PP_Bool DescribeAsIPv4Address(PP_Resource addr,
 }
 
 PP_Bool DescribeAsIPv6Address(PP_Resource addr,
-                              struct PP_NetAddress_IPv6_Dev* ipv6_addr) {
-  VLOG(4) << "PPB_NetAddress_Dev::DescribeAsIPv6Address()";
+                              struct PP_NetAddress_IPv6* ipv6_addr) {
+  VLOG(4) << "PPB_NetAddress::DescribeAsIPv6Address()";
   EnterResource<PPB_NetAddress_API> enter(addr, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->DescribeAsIPv6Address(ipv6_addr);
 }
 
-const PPB_NetAddress_Dev_0_1 g_ppb_netaddress_dev_thunk_0_1 = {
+const PPB_NetAddress_1_0 g_ppb_netaddress_thunk_1_0 = {
   &CreateFromIPv4Address,
   &CreateFromIPv6Address,
   &IsNetAddress,
@@ -90,8 +90,8 @@ const PPB_NetAddress_Dev_0_1 g_ppb_netaddress_dev_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_NetAddress_Dev_0_1* GetPPB_NetAddress_Dev_0_1_Thunk() {
-  return &g_ppb_netaddress_dev_thunk_0_1;
+const PPB_NetAddress_1_0* GetPPB_NetAddress_1_0_Thunk() {
+  return &g_ppb_netaddress_thunk_1_0;
 }
 
 }  // namespace thunk