Fix render_process_id and render_frame_id being specified with webRequest for navigations.

Bug: 838406
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I19a1e40a87bad542c99e3c0abe83559dff9a4199
Reviewed-on: https://chromium-review.googlesource.com/1042807Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556044}

extensions/browser/api/web_request/web_request_api.cc

@@ -459,7 +459,10 @@ bool WebRequestAPI::MaybeProxyURLLoaderFactory(
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&WebRequestProxyingURLLoaderFactory::StartProxying, proxy,
-                     frame->GetProcess()->GetID(), frame->GetRoutingID(),
+                     // Match the behavior of the WebRequestInfo constructor
+                     // which takes a net::URLRequest*.
+                     is_navigation ? -1 : frame->GetProcess()->GetID(),
+                     is_navigation ? MSG_ROUTING_NONE : frame->GetRoutingID(),
                      std::move(navigation_ui_data), std::move(proxied_request),
                      std::move(target_factory_info),
                      base::BindOnce(&WebRequestAPI::RemoveProxyThreadSafe,

testing/buildbot/filters/mojo.fyi.network_browser_tests.filter

@@ -149,9 +149,8 @@
 -ExtensionWebRequestApiTest.WebRequestDeclarative2
 -ExtensionWebRequestApiTest.WebRequestDiceHeaderProtection
 -ExtensionWebRequestApiTest.WebRequestTypes
--ExtensionWebRequestApiTest.WebRequestTestOSDD
+-ExtensionWebRequestApiTest.WebRequestTestOSDD
 -ExtensionWebRequestApiTest.WebRequestURLFetcherInterception
--LocalNTPInterceptionWebRequestAPITest.OneGoogleBarRequestsHidden
 
 # https://crbug.com/721400
 # WebSocket with the network service