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..5428dc33ffe9a69187cd594e729031fe2636e2b1 100644
--- a/extensions/browser/api/web_request/web_request_event_details.cc
+++ b/extensions/browser/api/web_request/web_request_event_details.cc
@@ -153,9 +153,12 @@ void WebRequestEventDetails::DetermineFrameIdOnUI() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-  dict_.SetInteger(keys::kFrameIdKey, ExtensionApiFrameIdMap::GetFrameId(rfh));
-  dict_.SetInteger(keys::kParentFrameIdKey,
-                   ExtensionApiFrameIdMap::GetParentFrameId(rfh));
+  ExtensionApiFrameIdMap::FrameData frame_data =
+      ExtensionApiFrameIdMap::Get()->GetFrameData(rfh);
+
+  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);
 }
 
 void WebRequestEventDetails::DetermineFrameIdOnIO(
@@ -190,6 +193,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));