Move URLLoader, URLRequestInfo, and URLResponseInfo out of the dev directory

and rename accordingly.

Rename URLResponseInfo.GetBody to GetBodyAsFileRef.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/4747001

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

4 files changed, 25 insertions, 27 deletions

diff --git a/ppapi/c/dev/ppb_url_loader_dev.h b/ppapi/c/ppb_url_loader.h
index c0c5fff..7d039d6 100644
--- a/ppapi/c/dev/ppb_url_loader_dev.h
+++ b/ppapi/c/ppb_url_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_C_DEV_PPB_URL_LOADER_DEV_H_
-#define PPAPI_C_DEV_PPB_URL_LOADER_DEV_H_
+#ifndef PPAPI_C_PPB_URL_LOADER_H_
+#define PPAPI_C_PPB_URL_LOADER_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ -12,7 +12,7 @@
 
 struct PP_CompletionCallback;
 
-#define PPB_URLLOADER_DEV_INTERFACE "PPB_URLLoader(Dev);0.2"
+#define PPB_URLLOADER_INTERFACE "PPB_URLLoader;1"
 
 // The interface for loading URLs.
 //
@@ -28,7 +28,7 @@ struct PP_CompletionCallback;
 // downloaded file to be complete.  The downloaded file may be accessed via the
 // GetBody method of the URLResponseInfo returned in step #4.
 //
-struct PPB_URLLoader_Dev {
+struct PPB_URLLoader {
   // Create a new URLLoader object.  Returns 0 if the instance is invalid.  The
   // URLLoader is associated with a particular instance, so that any UI dialogs
   // that need to be shown to the user can be positioned relative to the window
@@ -106,4 +106,4 @@ struct PPB_URLLoader_Dev {
   void (*Close)(PP_Resource loader);
 };
 
-#endif  // PPAPI_C_DEV_PPB_URL_LOADER_DEV_H_
+#endif  // PPAPI_C_PPB_URL_LOADER_H_
diff --git a/ppapi/c/dev/ppb_url_request_info_dev.h b/ppapi/c/ppb_url_request_info.h
index 26c6b2e..1c697fc1 100644
--- a/ppapi/c/dev/ppb_url_request_info_dev.h
+++ b/ppapi/c/ppb_url_request_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_C_DEV_PPB_URL_REQUEST_INFO_DEV_H_
-#define PPAPI_C_DEV_PPB_URL_REQUEST_INFO_DEV_H_
+#ifndef PPAPI_C_PPB_URL_REQUEST_INFO_H_
+#define PPAPI_C_PPB_URL_REQUEST_INFO_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_module.h"
@@ -31,13 +31,11 @@ typedef enum {
   //
   // Boolean (default = PP_FALSE).
   PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS
+} PP_URLRequestProperty;
 
-  // TODO(darin): Add security/privacy options?
-} PP_URLRequestProperty_Dev;
+#define PPB_URLREQUESTINFO_INTERFACE "PPB_URLRequestInfo;1"
 
-#define PPB_URLREQUESTINFO_DEV_INTERFACE "PPB_URLRequestInfo(Dev);0.2"
-
-struct PPB_URLRequestInfo_Dev {
+struct PPB_URLRequestInfo {
   // Create a new URLRequestInfo object.  Returns 0 if the module is invalid.
   PP_Resource (*Create)(PP_Module module);
 
@@ -50,7 +48,7 @@ struct PPB_URLRequestInfo_Dev {
   // invalid, PP_TRUE on success.  The value property must be the correct type
   // according to the property being set.
   PP_Bool (*SetProperty)(PP_Resource request,
-                         PP_URLRequestProperty_Dev property,
+                         PP_URLRequestProperty property,
                          struct PP_Var value);
 
   // Append data to the request body.
@@ -84,4 +82,4 @@ struct PPB_URLRequestInfo_Dev {
                               PP_Time expected_last_modified_time);
 };
 
-#endif  // PPAPI_C_DEV_PPB_URL_REQUEST_INFO_DEV_H_
+#endif  // PPAPI_C_PPB_URL_REQUEST_INFO_H_
diff --git a/ppapi/c/dev/ppb_url_response_info_dev.h b/ppapi/c/ppb_url_response_info.h
index e1307f5..97627ab 100644
--- a/ppapi/c/dev/ppb_url_response_info_dev.h
+++ b/ppapi/c/ppb_url_response_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_C_DEV_PPB_URL_RESPONSE_INFO_DEV_H_
-#define PPAPI_C_DEV_PPB_URL_RESPONSE_INFO_DEV_H_
+#ifndef PPAPI_C_PPB_URL_RESPONSE_INFO_H_
+#define PPAPI_C_PPB_URL_RESPONSE_INFO_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_resource.h"
@@ -16,11 +16,11 @@ typedef enum {
   PP_URLRESPONSEPROPERTY_STATUSCODE,      // int32
   PP_URLRESPONSEPROPERTY_STATUSLINE,      // string
   PP_URLRESPONSEPROPERTY_HEADERS          // string, \n-delim
-} PP_URLResponseProperty_Dev;
+} PP_URLResponseProperty;
 
-#define PPB_URLRESPONSEINFO_DEV_INTERFACE "PPB_URLResponseInfo(Dev);0.2"
+#define PPB_URLRESPONSEINFO_INTERFACE "PPB_URLResponseInfo;1"
 
-struct PPB_URLResponseInfo_Dev {
+struct PPB_URLResponseInfo {
   // Returns PP_TRUE if the given resource is an URLResponseInfo. Returns
   // PP_FALSE if the resource is invalid or some type other than an
   // URLResponseInfo.
@@ -29,7 +29,7 @@ struct PPB_URLResponseInfo_Dev {
   // Gets a response property.  Return PP_VarType_Void if an input parameter is
   // invalid.
   struct PP_Var (*GetProperty)(PP_Resource response,
-                               PP_URLResponseProperty_Dev property);
+                               PP_URLResponseProperty property);
 
   // Returns a FileRef pointing to the file containing the response body.  This
   // is only valid if PP_URLREQUESTPROPERTY_STREAMTOFILE was set on the
@@ -37,7 +37,7 @@ struct PPB_URLResponseInfo_Dev {
   // until the URLLoader associated with this URLResponseInfo is closed or
   // destroyed.  Returns 0 if PP_URLREQUESTPROPERTY_STREAMTOFILE was not
   // requested or if the URLLoader has not been opened yet.
-  PP_Resource (*GetBody)(PP_Resource response);
+  PP_Resource (*GetBodyAsFileRef)(PP_Resource response);
 };
 
-#endif  // PPAPI_C_DEV_PPB_URL_RESPONSE_INFO_DEV_H_
+#endif  // PPAPI_C_PPB_URL_RESPONSE_INFO_H_
diff --git a/ppapi/c/dev/ppb_url_loader_trusted_dev.h b/ppapi/c/trusted/ppb_url_loader_trusted.h
index 84aff0e..4e027f9 100644
--- a/ppapi/c/dev/ppb_url_loader_trusted_dev.h
+++ b/ppapi/c/trusted/ppb_url_loader_trusted.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_C_DEV_PPB_URL_LOADER_TRUSTED_DEV_H_
-#define PPAPI_C_DEV_PPB_URL_LOADER_TRUSTED_DEV_H_
+#ifndef PPAPI_C_PPB_URL_LOADER_TRUSTED_H_
+#define PPAPI_C_PPB_URL_LOADER_TRUSTED_H_
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_URLLOADERTRUSTED_DEV_INTERFACE "PPB_URLLoaderTrusted(Dev);0.2"
+#define PPB_URLLOADERTRUSTED_INTERFACE "PPB_URLLoaderTrusted;0.2"
 
 // Callback that indicates the status of the download and upload for the
 // given URLLoader resource.
@@ -22,7 +22,7 @@ typedef void (*PP_URLLoaderTrusted_StatusCallback)(
       int64_t total_bytes_to_be_received);
 
 // Available only to trusted implementations.
-struct PPB_URLLoaderTrusted_Dev {
+struct PPB_URLLoaderTrusted {
   // Grant this URLLoader the capability to make unrestricted cross-origin
   // requests.
   void (*GrantUniversalAccess)(PP_Resource loader);
@@ -42,4 +42,4 @@ struct PPB_URLLoaderTrusted_Dev {
                                  PP_URLLoaderTrusted_StatusCallback cb);
 };
 
-#endif  // PPAPI_C_DEV_PPB_URL_LOADER_DEV_H_
+#endif  // PPAPI_C_PPB_URL_LOADER_H_