PPAPI: Move PPB_NetworkProxy out of Dev

This depends on the following CLs:
https://codereview.chromium.org/17094022/
https://codereview.chromium.org/16819002/

BUG=247225

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

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

2 files changed, 75 insertions, 49 deletions

diff --git a/ppapi/c/dev/ppb_network_proxy_dev.h b/ppapi/c/dev/ppb_network_proxy_dev.h
deleted file mode 100644
index debda0f..0000000
--- a/ppapi/c/dev/ppb_network_proxy_dev.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (c) 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.
- */
-
-/* From dev/ppb_network_proxy_dev.idl modified Thu Jun  6 10:44:17 2013. */
-
-#ifndef PPAPI_C_DEV_PPB_NETWORK_PROXY_DEV_H_
-#define PPAPI_C_DEV_PPB_NETWORK_PROXY_DEV_H_
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_macros.h"
-#include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/pp_var.h"
-
-#define PPB_NETWORKPROXY_DEV_INTERFACE_0_1 "PPB_NetworkProxy(Dev);0.1"
-#define PPB_NETWORKPROXY_DEV_INTERFACE PPB_NETWORKPROXY_DEV_INTERFACE_0_1
-
-/**
- * @file
- * This file defines the <code>PPB_NetworkProxy_Dev</code> interface.
- */
-
-
-/**
- * @addtogroup Interfaces
- * @{
- */
-struct PPB_NetworkProxy_Dev_0_1 {
-  /**
-   * Retrieves the proxy that will be used for the given URL. The result will
-   * be a string in PAC format. For more details about PAC format, please see
-   * http://en.wikipedia.org/wiki/Proxy_auto-config
-   */
-  int32_t (*GetProxyForURL)(PP_Instance instance,
-                            struct PP_Var url,
-                            struct PP_Var* proxy_string,
-                            struct PP_CompletionCallback callback);
-};
-
-typedef struct PPB_NetworkProxy_Dev_0_1 PPB_NetworkProxy_Dev;
-/**
- * @}
- */
-
-#endif  /* PPAPI_C_DEV_PPB_NETWORK_PROXY_DEV_H_ */
-
diff --git a/ppapi/c/ppb_network_proxy.h b/ppapi/c/ppb_network_proxy.h
new file mode 100644
index 0000000..90a35b8
--- /dev/null
+++ b/ppapi/c/ppb_network_proxy.h
@@ -0,0 +1,75 @@
+/* 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.
+ */
+
+/* From ppb_network_proxy.idl modified Fri Jun 21 09:37:20 2013. */
+
+#ifndef PPAPI_C_PPB_NETWORK_PROXY_H_
+#define PPAPI_C_PPB_NETWORK_PROXY_H_
+
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_completion_callback.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_macros.h"
+#include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/pp_var.h"
+
+#define PPB_NETWORKPROXY_INTERFACE_1_0 "PPB_NetworkProxy;1.0"
+#define PPB_NETWORKPROXY_INTERFACE PPB_NETWORKPROXY_INTERFACE_1_0
+
+/**
+ * @file
+ * This file defines the <code>PPB_NetworkProxy</code> interface.
+ */
+
+
+/**
+ * @addtogroup Interfaces
+ * @{
+ */
+/**
+ * This interface provides a way to determine the appropriate proxy settings
+ * for a given URL.
+ *
+ * Permissions: Apps permission <code>socket</code> with subrule
+ * <code>resolve-proxy</code> is required for using this API.
+ * For more details about network communication permissions, please see:
+ * http://developer.chrome.com/apps/app_network.html
+ */
+struct PPB_NetworkProxy_1_0 {
+  /**
+   * Retrieves the proxy that will be used for the given URL. The result will
+   * be a string in PAC format. For more details about PAC format, please see
+   * http://en.wikipedia.org/wiki/Proxy_auto-config
+   *
+   * @param[in] instance A <code>PP_Instance</code> identifying one instance
+   * of a module.
+   *
+   * @param[in] url A string <code>PP_Var</code> containing a URL.
+   *
+   * @param[out] proxy_string A <code>PP_Var</code> that GetProxyForURL will
+   * set upon successful completion. If the call fails, <code>proxy_string
+   * </code> will be unchanged. Otherwise, it will be set to a string <code>
+   * PP_Var</code> containing the appropriate PAC string for <code>url</code>.
+   * If set, <code>proxy_string</code> will have a reference count of 1 which
+   * the plugin must manage.
+   *
+   * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
+   * completion.
+   *
+   * @return An int32_t containing an error code from <code>pp_errors.h</code>.
+   */
+  int32_t (*GetProxyForURL)(PP_Instance instance,
+                            struct PP_Var url,
+                            struct PP_Var* proxy_string,
+                            struct PP_CompletionCallback callback);
+};
+
+typedef struct PPB_NetworkProxy_1_0 PPB_NetworkProxy;
+/**
+ * @}
+ */
+
+#endif  /* PPAPI_C_PPB_NETWORK_PROXY_H_ */
+