Convert url request info to new proxy API.

webkit/plugins/ppapi/ppb_url_loader_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_URL_LOADER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_URL_LOADER_IMPL_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
-#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
+#include "ppapi/shared_impl/url_request_info_data.h"
 #include "ppapi/thunk/ppb_url_loader_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace WebKit {
 class WebURL;
 }
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_URLResponseInfo_Impl;
 
 class PPB_URLLoader_Impl : public ::ppapi::Resource,
                            public ::ppapi::thunk::PPB_URLLoader_API,
                            public WebKit::WebURLLoaderClient {
  public:
   PPB_URLLoader_Impl(PP_Instance instance, bool main_document_loader);
   virtual ~PPB_URLLoader_Impl();
 
   // Resource overrides.
   virtual ::ppapi::thunk::PPB_URLLoader_API* AsPPB_URLLoader_API() OVERRIDE;
   virtual void InstanceWasDeleted() OVERRIDE;
 
   // PPB_URLLoader_API implementation.
   virtual int32_t Open(
       PP_Resource request_id,
       scoped_refptr< ::ppapi::TrackedCallback> callback) OVERRIDE;
+  int32_t Open(const ::ppapi::URLRequestInfoData& data,
+               scoped_refptr< ::ppapi::TrackedCallback> callback) OVERRIDE;
   virtual int32_t FollowRedirect(
       scoped_refptr< ::ppapi::TrackedCallback> callback) OVERRIDE;
   virtual PP_Bool GetUploadProgress(int64_t* bytes_sent,
                                     int64_t* total_bytes_to_be_sent) OVERRIDE;
   virtual PP_Bool GetDownloadProgress(
       int64_t* bytes_received,
       int64_t* total_bytes_to_be_received) OVERRIDE;
   virtual PP_Resource GetResponseInfo() OVERRIDE;
   virtual int32_t ReadResponseBody(
       void* buffer,
@@ skipping 69 matching lines @@
 
   void FinishLoading(int32_t done_status);
 
   // If true, then the plugin instance is a full-frame plugin and we're just
   // wrapping the main document's loader (i.e. loader_ is null).
   bool main_document_loader_;
 
   // Keep a copy of the request data. We specifically do this instead of
   // keeping a reference to the request resource, because the plugin might
   // change the request info resource out from under us.
-  ::ppapi::PPB_URLRequestInfo_Data request_data_;
+  ::ppapi::URLRequestInfoData request_data_;
 
   // The loader associated with this request. MAY BE NULL.
   //
   // This will be NULL if the load hasn't been opened yet, or if this is a main
   // document loader (when registered as a mime type). Therefore, you should
   // always NULL check this value before using it. In the case of a main
   // document load, you would call the functions on the document to cancel the
   // load, etc. since there is no loader.
   scoped_ptr<WebKit::WebURLLoader> loader_;
 
@@ skipping 14 matching lines @@
 
   PP_URLLoaderTrusted_StatusCallback status_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_URLLoader_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_URL_LOADER_IMPL_H_