Fix chrome.webRequest.onBeforeRequest for requests coming from NPAPI plugin processes.

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/webplugin.h"
 #include "content/child/npapi/plugin_host.h"
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/plugin_stream_url.h"
 #include "content/child/npapi/webplugin_resource_client.h"
 #include "content/child/plugin_messages.h"
+#include "content/child/request_extra_data.h"
 #include "content/child/resource_dispatcher.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "webkit/child/multipart_response_delegate.h"
 #include "webkit/child/weburlloader_impl.h"
 #include "webkit/common/resource_request_body.h"
 
@@ skipping 49 matching lines @@
                                    const GURL& url,
                                    const GURL& first_party_for_cookies,
                                    const std::string& method,
                                    const char* buf,
                                    unsigned int len,
                                    const GURL& referrer,
                                    bool notify_redirects,
                                    bool is_plugin_src_load,
                                    int origin_pid,
                                    int render_frame_id,
+                                   int render_view_id,
                                    unsigned long resource_id,
                                    bool copy_stream_data)
     : plugin_stream_(plugin_stream),
       url_(url),
       first_party_for_cookies_(first_party_for_cookies),
       method_(method),
       referrer_(referrer),
       notify_redirects_(notify_redirects),
       is_plugin_src_load_(is_plugin_src_load),
       resource_id_(resource_id),
       copy_stream_data_(copy_stream_data),
       data_offset_(0),
       pending_failure_notification_(false) {
   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_frame_id;
+  request_info.routing_id = render_view_id;
+
+  RequestExtraData extra_data(blink::WebReferrerPolicyDefault,
+                              base::string16(),
+                              false,
+                              render_frame_id,
+                              false,
+                              -1,
+                              GURL(),
+                              false,
+                              -1,
+                              true,
+                              PAGE_TRANSITION_LINK,
+                              false,
+                              -1,
+                              -1);
+
+  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())
         request_info.headers += "\r\n";
@@ skipping 214 matching lines @@
   }
 
   if (error_code == net::OK) {
     plugin_stream_->DidFinishLoading(resource_id_);
   } else {
     plugin_stream_->DidFail(resource_id_);
   }
 }
 
 }  // namespace content