webRequest: Also identify frames for non-RDH-initiated requests

extensions/browser/api/web_request/web_request_event_details.cc

 // Copyright 2016 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 "extensions/browser/api/web_request/web_request_event_details.h"
 
 #include "base/callback.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 21 matching lines @@
     : extra_info_spec_(extra_info_spec),
       render_process_id_(content::ChildProcessHost::kInvalidUniqueID),
       render_frame_id_(MSG_ROUTING_NONE) {
   content::ResourceType resource_type = content::RESOURCE_TYPE_LAST_TYPE;
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
   if (info) {
     render_process_id_ = info->GetChildID();
     render_frame_id_ = info->GetRenderFrameID();
     resource_type = info->GetResourceType();
+  } else {
+    // Fallback for requests that are not allocated by a ResourceDispatcherHost,
+    // such as the TemplateURLFetcher.
+    content::ResourceRequestInfo::GetRenderFrameForRequest(
+        request, &render_process_id_, &render_frame_id_);
   }
 
   dict_.SetString(keys::kMethodKey, request->method());
   dict_.SetString(keys::kRequestIdKey,
                   base::Uint64ToString(request->identifier()));
   dict_.SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000);
   dict_.SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type));
   dict_.SetString(keys::kUrlKey, request->url().spec());
 }
 
@@ skipping 141 matching lines @@
     std::unique_ptr<WebRequestEventDetails> self,
     const DeterminedFrameDataCallback& callback,
     const ExtensionApiFrameIdMap::FrameData& frame_data) {
   dict_.SetInteger(keys::kTabIdKey, frame_data.tab_id);
   dict_.SetInteger(keys::kFrameIdKey, frame_data.frame_id);
   dict_.SetInteger(keys::kParentFrameIdKey, frame_data.parent_frame_id);
   callback.Run(std::move(self));
 }
 
 }  // namespace extensions