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

webkit/glue/plugins/pepper_url_loader.cc

 // Copyright (c) 2010 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.
 
 #include "webkit/glue/plugins/pepper_url_loader.h"
 
 #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"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
@@ skipping 113 matching lines @@
 }
 
 void Close(PP_Resource loader_id) {
   scoped_refptr<URLLoader> loader(Resource::GetAs<URLLoader>(loader_id));
   if (!loader)
     return;
 
   loader->Close();
 }
 
-const PPB_URLLoader_Dev ppb_urlloader = {
+const PPB_URLLoader ppb_urlloader = {
   &Create,
   &IsURLLoader,
   &Open,
   &FollowRedirect,
   &GetUploadProgress,
   &GetDownloadProgress,
   &GetResponseInfo,
   &ReadResponseBody,
   &FinishStreamingToFile,
   &Close
 };
 
 void GrantUniversalAccess(PP_Resource loader_id) {
   scoped_refptr<URLLoader> loader(Resource::GetAs<URLLoader>(loader_id));
   if (!loader)
     return;
 
   loader->GrantUniversalAccess();
 }
 
 void SetStatusCallback(PP_Resource loader_id,
                        PP_URLLoaderTrusted_StatusCallback cb) {
   scoped_refptr<URLLoader> loader(Resource::GetAs<URLLoader>(loader_id));
   if (!loader)
     return;
   loader->SetStatusCallback(cb);
 }
 
-const PPB_URLLoaderTrusted_Dev ppb_urlloadertrusted = {
+const PPB_URLLoaderTrusted ppb_urlloadertrusted = {
   &GrantUniversalAccess,
   &SetStatusCallback
 };
 
 WebKit::WebFrame* GetFrame(PluginInstance* instance) {
   return instance->container()->element().document().frame();
 }
 
 }  // namespace
 
@@ skipping 15 matching lines @@
       status_callback_(NULL) {
   instance->AddObserver(this);
 }
 
 URLLoader::~URLLoader() {
   if (instance_)
     instance_->RemoveObserver(this);
 }
 
 // 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;
 }
 
 int32_t URLLoader::Open(URLRequestInfo* request,
                         PP_CompletionCallback callback) {
   if (loader_.get())
     return PP_ERROR_INPROGRESS;
 
   // We only support non-blocking calls.
   if (!callback.func)
@@ skipping 293 matching lines @@
           instance_->pp_instance(), pp_resource,
           record_upload_progress_ ? bytes_sent_ : -1,
           record_upload_progress_ ? total_bytes_to_be_sent_ : -1,
           record_download_progress_ ? bytes_received_ : -1,
           record_download_progress_ ? total_bytes_to_be_received_ : -1);
     }
   }
 }
 
 }  // namespace pepper