Add "PRIVATE" to the enum names of some private Pepper networking APIs:

- ppb_net_address_private.idl
- ppb_host_resolver_private.idl
- ppb_tcp_socket_private.idl
- ppb_udp_socket_private.idl

Currently, we have very similar enum names in the private and public
Pepper networking APIs (for example, PP_NETADDRESSFAMILY_IPV4
and PP_NETADDRESS_FAMILY_IPV4). The purpose of this CL is to make the
distinction more clear.

This CL doesn't break existing plugins compiled with old private networking enums (without "PRIVATE" in the names). They will still run on newer versions of Chrome.

The only consequence is that they will get compile errors when they compile with new SDK (with new enum names). But the errors should be very straightforward to fix.

BUG=253583
TEST=None
R=bbudge@chromium.org, tsepez@chromium.org, wez@chromium.org

Review URL: https://codereview.chromium.org/17615004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208291 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 9 deletions

diff --git a/ppapi/proxy/host_resolver_resource.cc b/ppapi/proxy/host_resolver_resource.cc
index c21d482..a289856 100644
--- a/ppapi/proxy/host_resolver_resource.cc
+++ b/ppapi/proxy/host_resolver_resource.cc
@@ -19,22 +19,22 @@ PP_HostResolver_Private_Hint ConvertToHostResolverPrivateHint(
   PP_HostResolver_Private_Hint private_hint;
   switch (hint.family) {
     case PP_NETADDRESS_FAMILY_UNSPECIFIED:
-      private_hint.family = PP_NETADDRESSFAMILY_UNSPECIFIED;
+      private_hint.family = PP_NETADDRESSFAMILY_PRIVATE_UNSPECIFIED;
       break;
     case PP_NETADDRESS_FAMILY_IPV4:
-      private_hint.family = PP_NETADDRESSFAMILY_IPV4;
+      private_hint.family = PP_NETADDRESSFAMILY_PRIVATE_IPV4;
       break;
     case PP_NETADDRESS_FAMILY_IPV6:
-      private_hint.family = PP_NETADDRESSFAMILY_IPV6;
+      private_hint.family = PP_NETADDRESSFAMILY_PRIVATE_IPV6;
       break;
     default:
       NOTREACHED();
-      private_hint.family = PP_NETADDRESSFAMILY_UNSPECIFIED;
+      private_hint.family = PP_NETADDRESSFAMILY_PRIVATE_UNSPECIFIED;
   }
 
   private_hint.flags = 0;
   if (hint.flags & PP_HOSTRESOLVER_FLAG_CANONNAME)
-    private_hint.flags |= PP_HOST_RESOLVER_FLAGS_CANONNAME;
+    private_hint.flags |= PP_HOST_RESOLVER_PRIVATE_FLAGS_CANONNAME;
 
   return private_hint;
 }
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 63f23b58..7452807 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -84,7 +84,8 @@ IPC_ENUM_TRAITS(PP_FlashSetting)
 IPC_ENUM_TRAITS(PP_ImageDataFormat)
 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
 IPC_ENUM_TRAITS(PP_InputEvent_Type)
-IPC_ENUM_TRAITS_MAX_VALUE(PP_NetAddressFamily_Private, PP_NETADDRESSFAMILY_IPV6)
+IPC_ENUM_TRAITS_MAX_VALUE(PP_NetAddressFamily_Private,
+                          PP_NETADDRESSFAMILY_PRIVATE_IPV6)
 IPC_ENUM_TRAITS(PP_NetworkListState_Private)
 IPC_ENUM_TRAITS(PP_NetworkListType_Private)
 IPC_ENUM_TRAITS(PP_PrintOrientation_Dev)
diff --git a/ppapi/proxy/udp_socket_private_resource.cc b/ppapi/proxy/udp_socket_private_resource.cc
index ee14bdd..af43c10 100644
--- a/ppapi/proxy/udp_socket_private_resource.cc
+++ b/ppapi/proxy/udp_socket_private_resource.cc
@@ -29,13 +29,13 @@ int32_t UDPSocketPrivateResource::SetSocketFeature(
     PP_Var value) {
   PP_UDPSocket_Option public_name = PP_UDPSOCKET_OPTION_ADDRESS_REUSE;
   switch (name) {
-    case PP_UDPSOCKETFEATURE_ADDRESS_REUSE:
+    case PP_UDPSOCKETFEATURE_PRIVATE_ADDRESS_REUSE:
       // |public_name| has been initialized above.
       break;
-    case PP_UDPSOCKETFEATURE_BROADCAST:
+    case PP_UDPSOCKETFEATURE_PRIVATE_BROADCAST:
       public_name = PP_UDPSOCKET_OPTION_BROADCAST;
       break;
-    case PP_UDPSOCKETFEATURE_COUNT:
+    case PP_UDPSOCKETFEATURE_PRIVATE_COUNT:
       return PP_ERROR_BADARGUMENT;
     default:
       NOTREACHED();