webRequest: reliably determine tabId

extensions/browser/api/web_request/web_request_event_details.cc

Index: extensions/browser/api/web_request/web_request_event_details.cc
diff --git a/extensions/browser/api/web_request/web_request_event_details.cc b/extensions/browser/api/web_request/web_request_event_details.cc
index a9f2f83912380831a93f0fc2594122276e4ebd1e..2992c2785d926e1429d1cb008bd73de6d69dde0b 100644
--- a/extensions/browser/api/web_request/web_request_event_details.cc
+++ b/extensions/browser/api/web_request/web_request_event_details.cc
@@ -153,6 +153,11 @@ void WebRequestEventDetails::DetermineFrameIdOnUI() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+  int tab_id = -1;
+  int window_id = -1;
+  ExtensionApiFrameIdMap::GetTabAndWindowId(rfh, &tab_id, &window_id);
+
+  dict_.SetInteger(keys::kTabIdKey, tab_id);
   dict_.SetInteger(keys::kFrameIdKey, ExtensionApiFrameIdMap::GetFrameId(rfh));
   dict_.SetInteger(keys::kParentFrameIdKey,
                    ExtensionApiFrameIdMap::GetParentFrameId(rfh));
@@ -190,6 +195,7 @@ void WebRequestEventDetails::OnDeterminedFrameId(
     std::unique_ptr<WebRequestEventDetails> self,
     const DeterminedFrameIdCallback& 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));