Remove content::RequestInfo

content/child/url_response_body_consumer_unittest.cc

 // Copyright 2016 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 "content/child/url_response_body_consumer.h"
 
 #include "base/bind.h"
 #include "base/callback_forward.h"
 #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 {
 
 namespace {
 
 class TestRequestPeer : public RequestPeer {
  public:
   struct Context;
   explicit TestRequestPeer(Context* context) : context_(context) {}
 
@@ skipping 56 matching lines @@
   ~URLResponseBodyConsumerTest() override {
     dispatcher_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   bool Send(IPC::Message* message) override {
     delete message;
     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() {
     MojoCreateDataPipeOptions options;
     options.struct_size = sizeof(MojoCreateDataPipeOptions);
     options.flags = MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE;
     options.element_num_bytes = 1;
     options.capacity_num_bytes = 1024;
     return options;
   }
 
   // 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);
   }
 
   void Run(TestRequestPeer::Context* context) {
     base::RunLoop run_loop;
     context->run_loop_quit_closure = run_loop.QuitClosure();
     run_loop.Run();
   }
 
   base::MessageLoop message_loop_;
   std::unique_ptr<ResourceDispatcher> dispatcher_;
   static const MojoWriteDataFlags kNone = MOJO_WRITE_DATA_FLAG_NONE;
 };
 
 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(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
       message_loop_.task_runner()));
 
   mojo::ScopedDataPipeProducerHandle writer =
       std::move(data_pipe.producer_handle);
   std::string buffer = "hello";
   uint32_t size = buffer.size();
   MojoResult result =
       mojo::WriteDataRaw(writer.get(), buffer.c_str(), &size, kNone);
   ASSERT_EQ(MOJO_RESULT_OK, result);
   ASSERT_EQ(buffer.size(), size);
 
   Run(&context);
 
   EXPECT_FALSE(context.complete);
   EXPECT_EQ("hello", context.data);
 }
 
 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(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
       message_loop_.task_runner()));
 
   consumer->OnComplete(ResourceRequestCompletionStatus());
   mojo::ScopedDataPipeProducerHandle writer =
       std::move(data_pipe.producer_handle);
   std::string buffer = "hello";
@@ skipping 10 matching lines @@
   EXPECT_EQ("hello", context.data);
 
   Run(&context);
 
   EXPECT_TRUE(context.complete);
   EXPECT_EQ("hello", context.data);
 }
 
 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(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
       message_loop_.task_runner()));
 
   ResourceRequestCompletionStatus status;
   status.error_code = net::ERR_FAILED;
   data_pipe.producer_handle.reset();
   consumer->OnComplete(status);
 
   Run(&context);
 
   EXPECT_TRUE(context.complete);
   EXPECT_EQ(net::ERR_FAILED, context.error_code);
   EXPECT_EQ("", context.data);
 }
 
 }  // namespace
 
 }  // namespace content