diff options
| author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 21:35:00 +0000 |
|---|---|---|
| committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 21:35:00 +0000 |
| commit | 354ce199cfce43ee67f9bbb1c1abf12df83ace35 (patch) | |
| tree | 268da5d828c17bc30e72e2b9f2b6ed2737df6e32 /content/child/npapi | |
| parent | 3c159db81259e534438f1c67162b63395b29789a (diff) | |
| download | chromium_src-354ce199cfce43ee67f9bbb1c1abf12df83ace35.zip chromium_src-354ce199cfce43ee67f9bbb1c1abf12df83ace35.tar.gz chromium_src-354ce199cfce43ee67f9bbb1c1abf12df83ace35.tar.bz2 | |
Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2)
patch from issue 182383015, with changes to plugin_url_fetcher.cc, resource_dispatcher_unittest.cc, and render_frame_impl.cc to create RequestExtraData object on stack instead of with new
BUG=338338
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/203853003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/npapi')
| -rw-r--r-- | content/child/npapi/plugin_url_fetcher.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc index d620435..a1d1530 100644 --- a/content/child/npapi/plugin_url_fetcher.cc +++ b/content/child/npapi/plugin_url_fetcher.cc @@ -108,21 +108,9 @@ PluginURLFetcher::PluginURLFetcher(PluginStreamUrl* plugin_stream, 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; |