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

7 files changed, 36 insertions, 36 deletions

diff --git a/webkit/glue/plugins/pepper_plugin_module.cc b/webkit/glue/plugins/pepper_plugin_module.cc
index cf17813..b7bad9f 100644
--- a/webkit/glue/plugins/pepper_plugin_module.cc
+++ b/webkit/glue/plugins/pepper_plugin_module.cc
@@ -27,16 +27,11 @@
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_transport_dev.h"
-#include "ppapi/c/dev/ppb_url_loader_dev.h"
-#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h"
-#include "ppapi/c/dev/ppb_url_request_info_dev.h"
-#include "ppapi/c/dev/ppb_url_response_info_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
-#include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
@@ -45,9 +40,14 @@
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/ppb_url_request_info.h"
+#include "ppapi/c/ppb_url_response_info.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/trusted/ppb_image_data_trusted.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "webkit/glue/plugins/pepper_audio.h"
@@ -233,13 +233,13 @@ const void* GetInterface(const char* name) {
 #endif  // ENABLE_GPU
   if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
     return Transport::GetInterface();
-  if (strcmp(name, PPB_URLLOADER_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLLOADER_INTERFACE) == 0)
     return URLLoader::GetInterface();
-  if (strcmp(name, PPB_URLLOADERTRUSTED_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
     return URLLoader::GetTrustedInterface();
-  if (strcmp(name, PPB_URLREQUESTINFO_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE) == 0)
     return URLRequestInfo::GetInterface();
-  if (strcmp(name, PPB_URLRESPONSEINFO_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE) == 0)
     return URLResponseInfo::GetInterface();
   if (strcmp(name, PPB_BUFFER_DEV_INTERFACE) == 0)
     return Buffer::GetInterface();
diff --git a/webkit/glue/plugins/pepper_url_loader.cc b/webkit/glue/plugins/pepper_url_loader.cc
index c9a580a..20be805 100644
--- a/webkit/glue/plugins/pepper_url_loader.cc
+++ b/webkit/glue/plugins/pepper_url_loader.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/dev/ppb_url_loader_dev.h"
-#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
@@ -142,7 +142,7 @@ void Close(PP_Resource loader_id) {
   loader->Close();
 }
 
-const PPB_URLLoader_Dev ppb_urlloader = {
+const PPB_URLLoader ppb_urlloader = {
   &Create,
   &IsURLLoader,
   &Open,
@@ -171,7 +171,7 @@ void SetStatusCallback(PP_Resource loader_id,
   loader->SetStatusCallback(cb);
 }
 
-const PPB_URLLoaderTrusted_Dev ppb_urlloadertrusted = {
+const PPB_URLLoaderTrusted ppb_urlloadertrusted = {
   &GrantUniversalAccess,
   &SetStatusCallback
 };
@@ -207,12 +207,12 @@ URLLoader::~URLLoader() {
 }
 
 // static
-const PPB_URLLoader_Dev* URLLoader::GetInterface() {
+const PPB_URLLoader* URLLoader::GetInterface() {
   return &ppb_urlloader;
 }
 
 // static
-const PPB_URLLoaderTrusted_Dev* URLLoader::GetTrustedInterface() {
+const PPB_URLLoaderTrusted* URLLoader::GetTrustedInterface() {
   return &ppb_urlloadertrusted;
 }
 
diff --git a/webkit/glue/plugins/pepper_url_loader.h b/webkit/glue/plugins/pepper_url_loader.h
index dd91708..22adb6c 100644
--- a/webkit/glue/plugins/pepper_url_loader.h
+++ b/webkit/glue/plugins/pepper_url_loader.h
@@ -9,13 +9,13 @@
 
 #include "base/scoped_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
-struct PPB_URLLoader_Dev;
-struct PPB_URLLoaderTrusted_Dev;
+struct PPB_URLLoader;
+struct PPB_URLLoaderTrusted;
 
 namespace WebKit {
 class WebFrame;
@@ -37,11 +37,11 @@ class URLLoader : public Resource,
 
   // Returns a pointer to the interface implementing PPB_URLLoader that is
   // exposed to the plugin.
-  static const PPB_URLLoader_Dev* GetInterface();
+  static const PPB_URLLoader* GetInterface();
 
   // Returns a pointer to the interface implementing PPB_URLLoaderTrusted that
   // is exposed to the plugin.
-  static const PPB_URLLoaderTrusted_Dev* GetTrustedInterface();
+  static const PPB_URLLoaderTrusted* GetTrustedInterface();
 
   // Resource overrides.
   URLLoader* AsURLLoader() { return this; }
diff --git a/webkit/glue/plugins/pepper_url_request_info.cc b/webkit/glue/plugins/pepper_url_request_info.cc
index ae0c280..f606509 100644
--- a/webkit/glue/plugins/pepper_url_request_info.cc
+++ b/webkit/glue/plugins/pepper_url_request_info.cc
@@ -62,7 +62,7 @@ PP_Bool IsURLRequestInfo(PP_Resource resource) {
 }
 
 PP_Bool SetProperty(PP_Resource request_id,
-                    PP_URLRequestProperty_Dev property,
+                    PP_URLRequestProperty property,
                     PP_Var var) {
   scoped_refptr<URLRequestInfo> request(
       Resource::GetAs<URLRequestInfo>(request_id));
@@ -117,7 +117,7 @@ PP_Bool AppendFileToBody(PP_Resource request_id,
                                                 expected_last_modified_time));
 }
 
-const PPB_URLRequestInfo_Dev ppb_urlrequestinfo = {
+const PPB_URLRequestInfo ppb_urlrequestinfo = {
   &Create,
   &IsURLRequestInfo,
   &SetProperty,
@@ -164,11 +164,11 @@ URLRequestInfo::~URLRequestInfo() {
 }
 
 // static
-const PPB_URLRequestInfo_Dev* URLRequestInfo::GetInterface() {
+const PPB_URLRequestInfo* URLRequestInfo::GetInterface() {
   return &ppb_urlrequestinfo;
 }
 
-bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty_Dev property,
+bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty property,
                                         bool value) {
   switch (property) {
     case PP_URLREQUESTPROPERTY_STREAMTOFILE:
@@ -189,7 +189,7 @@ bool URLRequestInfo::SetBooleanProperty(PP_URLRequestProperty_Dev property,
   }
 }
 
-bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty_Dev property,
+bool URLRequestInfo::SetStringProperty(PP_URLRequestProperty property,
                                        const std::string& value) {
   // TODO(darin): Validate input.  Perhaps at a different layer?
   switch (property) {
diff --git a/webkit/glue/plugins/pepper_url_request_info.h b/webkit/glue/plugins/pepper_url_request_info.h
index 4fd4e26..7aa9fc1 100644
--- a/webkit/glue/plugins/pepper_url_request_info.h
+++ b/webkit/glue/plugins/pepper_url_request_info.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/ref_counted.h"
-#include "ppapi/c/dev/ppb_url_request_info_dev.h"
+#include "ppapi/c/ppb_url_request_info.h"
 #include "webkit/glue/plugins/pepper_file_ref.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
@@ -27,14 +27,14 @@ class URLRequestInfo : public Resource {
 
   // Returns a pointer to the interface implementing PPB_URLRequestInfo that is
   // exposed to the plugin.
-  static const PPB_URLRequestInfo_Dev* GetInterface();
+  static const PPB_URLRequestInfo* GetInterface();
 
   // Resource overrides.
   URLRequestInfo* AsURLRequestInfo() { return this; }
 
   // PPB_URLRequestInfo implementation.
-  bool SetBooleanProperty(PP_URLRequestProperty_Dev property, bool value);
-  bool SetStringProperty(PP_URLRequestProperty_Dev property,
+  bool SetBooleanProperty(PP_URLRequestProperty property, bool value);
+  bool SetStringProperty(PP_URLRequestProperty property,
                          const std::string& value);
   bool AppendDataToBody(const std::string& data);
   bool AppendFileToBody(FileRef* file_ref,
diff --git a/webkit/glue/plugins/pepper_url_response_info.cc b/webkit/glue/plugins/pepper_url_response_info.cc
index 2e7202f..5ae484f 100644
--- a/webkit/glue/plugins/pepper_url_response_info.cc
+++ b/webkit/glue/plugins/pepper_url_response_info.cc
@@ -44,7 +44,7 @@ PP_Bool IsURLResponseInfo(PP_Resource resource) {
 }
 
 PP_Var GetProperty(PP_Resource response_id,
-                   PP_URLResponseProperty_Dev property) {
+                   PP_URLResponseProperty property) {
   scoped_refptr<URLResponseInfo> response(
       Resource::GetAs<URLResponseInfo>(response_id));
   if (!response)
@@ -67,7 +67,7 @@ PP_Resource GetBody(PP_Resource response_id) {
   return body->GetReference();
 }
 
-const PPB_URLResponseInfo_Dev ppb_urlresponseinfo = {
+const PPB_URLResponseInfo ppb_urlresponseinfo = {
   &IsURLResponseInfo,
   &GetProperty,
   &GetBody
@@ -88,11 +88,11 @@ URLResponseInfo::~URLResponseInfo() {
 }
 
 // static
-const PPB_URLResponseInfo_Dev* URLResponseInfo::GetInterface() {
+const PPB_URLResponseInfo* URLResponseInfo::GetInterface() {
   return &ppb_urlresponseinfo;
 }
 
-PP_Var URLResponseInfo::GetProperty(PP_URLResponseProperty_Dev property) {
+PP_Var URLResponseInfo::GetProperty(PP_URLResponseProperty property) {
   switch (property) {
     case PP_URLRESPONSEPROPERTY_URL:
       return StringVar::StringToPPVar(module(), url_);
diff --git a/webkit/glue/plugins/pepper_url_response_info.h b/webkit/glue/plugins/pepper_url_response_info.h
index ff3a832..adbf8ef 100644
--- a/webkit/glue/plugins/pepper_url_response_info.h
+++ b/webkit/glue/plugins/pepper_url_response_info.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "ppapi/c/dev/ppb_url_response_info_dev.h"
+#include "ppapi/c/ppb_url_response_info.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
 namespace WebKit {
@@ -23,13 +23,13 @@ class URLResponseInfo : public Resource {
 
   // Returns a pointer to the interface implementing PPB_URLResponseInfo that
   // is exposed to the plugin.
-  static const PPB_URLResponseInfo_Dev* GetInterface();
+  static const PPB_URLResponseInfo* GetInterface();
 
   // Resource overrides.
   URLResponseInfo* AsURLResponseInfo() { return this; }
 
   // PPB_URLResponseInfo implementation.
-  PP_Var GetProperty(PP_URLResponseProperty_Dev property);
+  PP_Var GetProperty(PP_URLResponseProperty property);
 
   bool Initialize(const WebKit::WebURLResponse& response);