diff options
Diffstat (limited to 'content/browser/loader')
4 files changed, 6 insertions, 11 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index c17a003..94899d5 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -53,6 +53,7 @@ #include "content/browser/worker_host/worker_service_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/resource_messages.h" +#include "content/common/resource_request_body.h" #include "content/common/ssl_status_serialization.h" #include "content/common/view_messages.h" #include "content/public/browser/browser_thread.h" @@ -94,13 +95,11 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/common/appcache/appcache_interfaces.h" #include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/common/resource_request_body.h" using base::Time; using base::TimeDelta; using base::TimeTicks; using webkit_blob::ShareableFileReference; -using webkit_glue::ResourceRequestBody; // ---------------------------------------------------------------------------- diff --git a/content/browser/loader/upload_data_stream_builder.cc b/content/browser/loader/upload_data_stream_builder.cc index 2e9a606..2db9fdf 100644 --- a/content/browser/loader/upload_data_stream_builder.cc +++ b/content/browser/loader/upload_data_stream_builder.cc @@ -6,17 +6,16 @@ #include "base/logging.h" #include "content/browser/fileapi/upload_file_system_file_element_reader.h" +#include "content/common/resource_request_body.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" #include "webkit/browser/blob/blob_data_handle.h" #include "webkit/browser/blob/blob_storage_context.h" -#include "webkit/common/resource_request_body.h" using webkit_blob::BlobData; using webkit_blob::BlobDataHandle; using webkit_blob::BlobStorageContext; -using webkit_glue::ResourceRequestBody; namespace content { namespace { diff --git a/content/browser/loader/upload_data_stream_builder.h b/content/browser/loader/upload_data_stream_builder.h index e2b6ce3..60b6f33 100644 --- a/content/browser/loader/upload_data_stream_builder.h +++ b/content/browser/loader/upload_data_stream_builder.h @@ -24,12 +24,10 @@ namespace webkit_blob { class BlobStorageContext; } -namespace webkit_glue { -class ResourceRequestBody; -} - namespace content { +class ResourceRequestBody; + class CONTENT_EXPORT UploadDataStreamBuilder { public: // Creates a new UploadDataStream from this request body. @@ -43,7 +41,7 @@ class CONTENT_EXPORT UploadDataStreamBuilder { // filesystem URLs. |file_task_runner| is used to perform file operations // when the data gets uploaded. static scoped_ptr<net::UploadDataStream> Build( - webkit_glue::ResourceRequestBody* body, + ResourceRequestBody* body, webkit_blob::BlobStorageContext* blob_context, fileapi::FileSystemContext* file_system_context, base::TaskRunner* file_task_runner); diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc index 4c9661c..dba3dff 100644 --- a/content/browser/loader/upload_data_stream_builder_unittest.cc +++ b/content/browser/loader/upload_data_stream_builder_unittest.cc @@ -11,18 +11,17 @@ #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/time/time.h" +#include "content/common/resource_request_body.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "webkit/browser/blob/blob_storage_context.h" -#include "webkit/common/resource_request_body.h" using webkit_blob::BlobData; using webkit_blob::BlobDataHandle; using webkit_blob::BlobStorageContext; -using webkit_glue::ResourceRequestBody; namespace content { namespace { |