Move PPB_HostResolver out of dev.

BUG=247225
TEST=None

Review URL: https://chromiumcodereview.appspot.com/17291015

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

1 files changed, 25 insertions, 26 deletions

diff --git a/ppapi/c/dev/ppb_host_resolver_dev.h b/ppapi/c/ppb_host_resolver.h
index e06c10f..cc66ffa 100644
--- a/ppapi/c/dev/ppb_host_resolver_dev.h
+++ b/ppapi/c/ppb_host_resolver.h
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppb_host_resolver_dev.idl modified Thu Jun 20 12:08:29 2013. */
+/* From ppb_host_resolver.idl modified Sat Jun 22 11:11:38 2013. */
 
-#ifndef PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_
-#define PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_
+#ifndef PPAPI_C_PPB_HOST_RESOLVER_H_
+#define PPAPI_C_PPB_HOST_RESOLVER_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
@@ -17,12 +17,12 @@
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_net_address.h"
 
-#define PPB_HOSTRESOLVER_DEV_INTERFACE_0_1 "PPB_HostResolver(Dev);0.1"
-#define PPB_HOSTRESOLVER_DEV_INTERFACE PPB_HOSTRESOLVER_DEV_INTERFACE_0_1
+#define PPB_HOSTRESOLVER_INTERFACE_1_0 "PPB_HostResolver;1.0"
+#define PPB_HOSTRESOLVER_INTERFACE PPB_HOSTRESOLVER_INTERFACE_1_0
 
 /**
  * @file
- * This file defines the <code>PPB_HostResolver_Dev</code> interface.
+ * This file defines the <code>PPB_HostResolver</code> interface.
  */
 
 
@@ -31,8 +31,8 @@
  * @{
  */
 /**
- * <code>PP_HostResolver_Flags_Dev</code> is an enumeration of flags which can
- * be OR-ed and passed to the host resolver. Currently there is only one flag
+ * <code>PP_HostResolver_Flag</code> is an enumeration of flags which can be
+ * OR-ed and passed to the host resolver. Currently there is only one flag
  * defined.
  */
 typedef enum {
@@ -40,9 +40,9 @@ typedef enum {
    * Hint to request the canonical name of the host, which can be retrieved by
    * <code>GetCanonicalName()</code>.
    */
-  PP_HOSTRESOLVER_FLAGS_CANONNAME = 1 << 0
-} PP_HostResolver_Flags_Dev;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flags_Dev, 4);
+  PP_HOSTRESOLVER_FLAG_CANONNAME = 1 << 0
+} PP_HostResolver_Flag;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flag, 4);
 /**
  * @}
  */
@@ -52,19 +52,19 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flags_Dev, 4);
  * @{
  */
 /**
- * <code>PP_HostResolver_Hint_Dev</code> represents hints for host resolution.
+ * <code>PP_HostResolver_Hint</code> represents hints for host resolution.
  */
-struct PP_HostResolver_Hint_Dev {
+struct PP_HostResolver_Hint {
   /**
    * Network address family.
    */
   PP_NetAddress_Family family;
   /**
-   * Combination of flags from <code>PP_HostResolver_Flags_Dev</code>.
+   * Combination of flags from <code>PP_HostResolver_Flag</code>.
    */
   int32_t flags;
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint, 8);
 /**
  * @}
  */
@@ -74,7 +74,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8);
  * @{
  */
 /**
- * The <code>PPB_HostResolver_Dev</code> interface supports host name
+ * The <code>PPB_HostResolver</code> interface supports host name
  * resolution.
  *
  * Permissions: In order to run <code>Resolve()</code>, apps permission
@@ -82,7 +82,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8);
  * For more details about network communication permissions, please see:
  * http://developer.chrome.com/apps/app_network.html
  */
-struct PPB_HostResolver_Dev_0_1 {
+struct PPB_HostResolver_1_0 {
   /**
    * Creates a host resolver resource.
    *
@@ -99,8 +99,7 @@ struct PPB_HostResolver_Dev_0_1 {
    * @param[in] resource A <code>PP_Resource</code> to check.
    *
    * @return <code>PP_TRUE</code> if the input is a
-   * <code>PPB_HostResolver_Dev</code> resource; <code>PP_FALSE</code>
-   * otherwise.
+   * <code>PPB_HostResolver</code> resource; <code>PP_FALSE</code> otherwise.
    */
   PP_Bool (*IsHostResolver)(PP_Resource resource);
   /**
@@ -113,7 +112,7 @@ struct PPB_HostResolver_Dev_0_1 {
    * @param[in] host The host name (or IP address literal) to resolve.
    * @param[in] port The port number to be set in the resulting network
    * addresses.
-   * @param[in] hint A <code>PP_HostResolver_Hint_Dev</code> structure providing
+   * @param[in] hint A <code>PP_HostResolver_Hint</code> structure providing
    * hints for host resolution.
    * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
    * completion.
@@ -126,7 +125,7 @@ struct PPB_HostResolver_Dev_0_1 {
   int32_t (*Resolve)(PP_Resource host_resolver,
                      const char* host,
                      uint16_t port,
-                     const struct PP_HostResolver_Hint_Dev* hint,
+                     const struct PP_HostResolver_Hint* hint,
                      struct PP_CompletionCallback callback);
   /**
    * Gets the canonical name of the host.
@@ -135,9 +134,9 @@ struct PPB_HostResolver_Dev_0_1 {
    * resolver.
    *
    * @return A string <code>PP_Var</code> on success, which is an empty string
-   * if <code>PP_HOSTRESOLVER_FLAGS_CANONNAME</code> is not set in the hint
-   * flags when calling <code>Resolve()</code>; an undefined <code>PP_Var</code>
-   * if there is a pending <code>Resolve()</code> call or the previous
+   * if <code>PP_HOSTRESOLVER_FLAG_CANONNAME</code> is not set in the hint flags
+   * when calling <code>Resolve()</code>; an undefined <code>PP_Var</code> if
+   * there is a pending <code>Resolve()</code> call or the previous
    * <code>Resolve()</code> call failed.
    */
   struct PP_Var (*GetCanonicalName)(PP_Resource host_resolver);
@@ -166,10 +165,10 @@ struct PPB_HostResolver_Dev_0_1 {
   PP_Resource (*GetNetAddress)(PP_Resource host_resolver, uint32_t index);
 };
 
-typedef struct PPB_HostResolver_Dev_0_1 PPB_HostResolver_Dev;
+typedef struct PPB_HostResolver_1_0 PPB_HostResolver;
 /**
  * @}
  */
 
-#endif  /* PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ */
+#endif  /* PPAPI_C_PPB_HOST_RESOLVER_H_ */