Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h

content/child/resource_dispatcher_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
@@ skipping 155 matching lines @@
     request_info.method = "GET";
     request_info.url = GURL(test_page_url);
     request_info.first_party_for_cookies = GURL(test_page_url);
     request_info.referrer = GURL();
     request_info.headers = std::string();
     request_info.load_flags = 0;
     request_info.requestor_pid = 0;
     request_info.request_type = ResourceType::SUB_RESOURCE;
     request_info.appcache_host_id = appcache::kNoHostId;
     request_info.routing_id = 0;
-    RequestExtraData extra_data(blink::WebPageVisibilityStateVisible,
-                                blink::WebString(),
-                                false, MSG_ROUTING_NONE, true, GURL(),
-                                false, -1, true,
-                                PAGE_TRANSITION_LINK, false, -1, -1,
-                                kInvalidServiceWorkerProviderId);
-    request_info.extra_data = &extra_data;
+    RequestExtraData* extra_data = new RequestExtraData();
+    extra_data->set_visibility_state(blink::WebPageVisibilityStateVisible);
+    extra_data->set_custom_user_agent(blink::WebString());
+    extra_data->set_was_after_preconnect_request(false);
+    extra_data->set_render_frame_id(MSG_ROUTING_NONE);
+    extra_data->set_is_main_frame(true);
+    extra_data->set_frame_origin(GURL());
+    extra_data->set_parent_is_main_frame(false);
+    extra_data->set_parent_render_frame_id(-1);
+    extra_data->set_allow_download(true);
+    extra_data->set_transition_type(PAGE_TRANSITION_LINK);
+    extra_data->set_should_replace_current_entry(false);
+    extra_data->set_transferred_request_child_id(-1);
+    extra_data->set_transferred_request_request_id(-1);
+    extra_data->set_service_worker_provider_id(kInvalidServiceWorkerProviderId);
+    request_info.extra_data = extra_data;
 
     return dispatcher_->CreateBridge(request_info);
   }
 
   std::vector<IPC::Message> message_queue_;
   static scoped_ptr<ResourceDispatcher> dispatcher_;
 };
 
 /*static*/
 scoped_ptr<ResourceDispatcher> ResourceDispatcherTest::dispatcher_;
@@ skipping 242 matching lines @@
   response_head.error_code = net::OK;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content