Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2)

content/child/npapi/plugin_url_fetcher.cc

 // Copyright (c) 2013 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/npapi/plugin_url_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/child/child_thread.h"
 #include "content/child/npapi/plugin_host.h"
 #include "content/child/npapi/plugin_instance.h"
@@ skipping 89 matching lines @@
   webkit_glue::ResourceLoaderBridge::RequestInfo request_info;
   request_info.method = method;
   request_info.url = url;
   request_info.first_party_for_cookies = first_party_for_cookies;
   request_info.referrer = referrer;
   request_info.load_flags = net::LOAD_NORMAL;
   request_info.requestor_pid = origin_pid;
   request_info.request_type = ResourceType::OBJECT;
   request_info.routing_id = render_view_id;
 
-  RequestExtraData extra_data(blink::WebPageVisibilityStateVisible,
-                              base::string16(),
-                              false,
-                              render_frame_id,
-                              false,
-                              GURL(),
-                              false,
-                              -1,
-                              true,
-                              PAGE_TRANSITION_LINK,
-                              false,
-                              -1,
-                              -1,
-                              kInvalidServiceWorkerProviderId);
-
+  RequestExtraData extra_data;
+  extra_data.set_render_frame_id(render_frame_id);
+  extra_data.set_is_main_frame(false);
   request_info.extra_data = &extra_data;
 
   std::vector<char> body;
   if (method == "POST") {
     bool content_type_found = false;
     std::vector<std::string> names;
     std::vector<std::string> values;
     PluginHost::SetPostData(buf, len, &names, &values, &body);
     for (size_t i = 0; i < names.size(); ++i) {
       if (!request_info.headers.empty())
@@ skipping 217 matching lines @@
   }
 
   if (error_code == net::OK) {
     plugin_stream_->DidFinishLoading(resource_id_);
   } else {
     plugin_stream_->DidFail(resource_id_);
   }
 }
 
 }  // namespace content