Move ResourceRequest to services/network in preparation of moving content/network.
TBR=nasko for ipc changes
Bug: 753658
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I26cd2721b1894e81cb4f121ab39ad5e2e0dd735a
Reviewed-on: https://chromium-review.googlesource.com/865102
Commit-Queue: John Abd-El-Malek <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529053}diff --git a/content/browser/file_url_loader_factory.cc b/content/browser/file_url_loader_factory.cc
index afd1a75..62dbebbd 100644
--- a/content/browser/file_url_loader_factory.cc
+++ b/content/browser/file_url_loader_factory.cc
@@ -23,7 +23,6 @@
#include "build/build_config.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/file_url_loader.h"
-#include "content/public/common/resource_request.h"
#include "content/public/common/url_loader.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/data_pipe.h"
@@ -38,6 +37,7 @@
#include "net/http/http_byte_range.h"
#include "net/http/http_util.h"
#include "net/url_request/redirect_info.h"
+#include "services/network/public/cpp/resource_request.h"
#include "storage/common/fileapi/file_system_util.h"
#include "url/gurl.h"
@@ -89,7 +89,7 @@
public net::DirectoryLister::DirectoryListerDelegate {
public:
static void CreateAndStart(const base::FilePath& profile_path,
- const ResourceRequest& request,
+ const network::ResourceRequest& request,
mojom::URLLoaderRequest loader,
mojom::URLLoaderClientPtrInfo client_info,
std::unique_ptr<FileURLLoaderObserver> observer) {
@@ -114,7 +114,7 @@
~FileURLDirectoryLoader() override = default;
void Start(const base::FilePath& profile_path,
- const ResourceRequest& request,
+ const network::ResourceRequest& request,
mojom::URLLoaderRequest loader,
mojom::URLLoaderClientPtrInfo client_info,
std::unique_ptr<content::FileURLLoaderObserver> observer) {
@@ -287,7 +287,7 @@
class FileURLLoader : public mojom::URLLoader {
public:
static void CreateAndStart(const base::FilePath& profile_path,
- const ResourceRequest& request,
+ const network::ResourceRequest& request,
mojom::URLLoaderRequest loader,
mojom::URLLoaderClientPtrInfo client_info,
DirectoryLoadingPolicy directory_loading_policy,
@@ -317,7 +317,7 @@
~FileURLLoader() override = default;
void Start(const base::FilePath& profile_path,
- const ResourceRequest& request,
+ const network::ResourceRequest& request,
mojom::URLLoaderRequest loader,
mojom::URLLoaderClientPtrInfo client_info,
DirectoryLoadingPolicy directory_loading_policy,
@@ -381,7 +381,7 @@
}
// Restart the request with a directory loader.
- ResourceRequest new_request = request;
+ network::ResourceRequest new_request = request;
new_request.url = directory_url;
FileURLDirectoryLoader::CreateAndStart(
profile_path, new_request, binding_.Unbind(), client.PassInterface(),
@@ -406,7 +406,7 @@
client->OnReceiveRedirect(redirect_info, head);
// Restart the request with the new URL.
- ResourceRequest new_request = request;
+ network::ResourceRequest new_request = request;
new_request.url = redirect_info.new_url;
return Start(profile_path, request, binding_.Unbind(),
client.PassInterface(), directory_loading_policy,
@@ -598,7 +598,7 @@
int32_t routing_id,
int32_t request_id,
uint32_t options,
- const ResourceRequest& request,
+ const network::ResourceRequest& request,
mojom::URLLoaderClientPtr client,
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
base::FilePath file_path;
@@ -625,7 +625,7 @@
bindings_.AddBinding(this, std::move(loader));
}
-void CreateFileURLLoader(const ResourceRequest& request,
+void CreateFileURLLoader(const network::ResourceRequest& request,
mojom::URLLoaderRequest loader,
mojom::URLLoaderClientPtr client,
std::unique_ptr<FileURLLoaderObserver> observer) {
