Remove content::RequestInfo

content/child/url_response_body_consumer_unittest.cc

Index: content/child/url_response_body_consumer_unittest.cc
diff --git a/content/child/url_response_body_consumer_unittest.cc b/content/child/url_response_body_consumer_unittest.cc
index 5c78a73760543217659235ee47866a5c62bcc65e..e1bc73eeaf1c97b4bebd8a67f449074ab94f1e44 100644
--- a/content/child/url_response_body_consumer_unittest.cc
+++ b/content/child/url_response_body_consumer_unittest.cc
@@ -9,12 +9,17 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
-#include "content/child/request_info.h"
+#include "content/child/request_extra_data.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
+#include "content/common/resource_request.h"
 #include "content/common/resource_request_completion_status.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/child/request_peer.h"
+#include "content/public/common/request_context_frame_type.h"
+#include "net/base/request_priority.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace content {
 
@@ -91,11 +96,20 @@ class URLResponseBodyConsumerTest : public ::testing::Test,
     return true;
   }
 
-  std::unique_ptr<RequestInfo> CreateRequestInfo() {
-    std::unique_ptr<RequestInfo> request_info(new RequestInfo);
-    request_info->method = "GET";
-    request_info->url = GURL("http://www.example.com/");
-    return request_info;
+  std::unique_ptr<ResourceRequest> CreateResourceRequest() {
+    std::unique_ptr<ResourceRequest> request(new ResourceRequest);
+
+    request->method = "GET";
+    request->url = GURL("http://www.example.com/");
+    request->priority = net::LOW;
+    request->appcache_host_id = 0;
+    request->fetch_request_mode = FETCH_REQUEST_MODE_NO_CORS;
+    request->fetch_frame_type = REQUEST_CONTEXT_FRAME_TYPE_NONE;
+
+    const RequestExtraData extra_data;
+    extra_data.CopyToResourceRequest(request.get());
+
+    return request;
   }
 
   MojoCreateDataPipeOptions CreateDataPipeOptions() {
@@ -108,10 +122,11 @@ class URLResponseBodyConsumerTest : public ::testing::Test,
   }
 
   // Returns the request id.
-  int SetUpRequestPeer(const RequestInfo& request_info,
+  int SetUpRequestPeer(std::unique_ptr<ResourceRequest> request,
                        TestRequestPeer::Context* context) {
     return dispatcher_->StartAsync(
-        request_info, nullptr, base::MakeUnique<TestRequestPeer>(context),
+        std::move(request), 0, nullptr, GURL(),
+        base::MakeUnique<TestRequestPeer>(context),
         blink::WebURLRequest::LoadingIPCType::ChromeIPC, nullptr);
   }
 
@@ -128,8 +143,8 @@ class URLResponseBodyConsumerTest : public ::testing::Test,
 
 TEST_F(URLResponseBodyConsumerTest, ReceiveData) {
   TestRequestPeer::Context context;
-  std::unique_ptr<RequestInfo> request_info(CreateRequestInfo());
-  int request_id = SetUpRequestPeer(*request_info, &context);
+  std::unique_ptr<ResourceRequest> request(CreateResourceRequest());
+  int request_id = SetUpRequestPeer(std::move(request), &context);
   mojo::DataPipe data_pipe(CreateDataPipeOptions());
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
@@ -153,8 +168,8 @@ TEST_F(URLResponseBodyConsumerTest, ReceiveData) {
 
 TEST_F(URLResponseBodyConsumerTest, OnCompleteThenClose) {
   TestRequestPeer::Context context;
-  std::unique_ptr<RequestInfo> request_info(CreateRequestInfo());
-  int request_id = SetUpRequestPeer(*request_info, &context);
+  std::unique_ptr<ResourceRequest> request(CreateResourceRequest());
+  int request_id = SetUpRequestPeer(std::move(request), &context);
   mojo::DataPipe data_pipe(CreateDataPipeOptions());
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
@@ -185,8 +200,8 @@ TEST_F(URLResponseBodyConsumerTest, OnCompleteThenClose) {
 
 TEST_F(URLResponseBodyConsumerTest, CloseThenOnComplete) {
   TestRequestPeer::Context context;
-  std::unique_ptr<RequestInfo> request_info(CreateRequestInfo());
-  int request_id = SetUpRequestPeer(*request_info, &context);
+  std::unique_ptr<ResourceRequest> request(CreateResourceRequest());
+  int request_id = SetUpRequestPeer(std::move(request), &context);
   mojo::DataPipe data_pipe(CreateDataPipeOptions());
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(