webRequest: reliably determine tabId

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 131 matching lines @@
   }
 }
 
 void WebRequestEventDetails::SetResponseSource(const net::URLRequest* request) {
   dict_.SetBoolean(keys::kFromCache, request->was_cached());
   const std::string response_ip = request->GetSocketAddress().host();
   if (!response_ip.empty())
     dict_.SetString(keys::kIpKey, response_ip);
 }
 
-void WebRequestEventDetails::DetermineFrameIdOnUI() {
+void WebRequestEventDetails::DetermineFrameDataOnUI() {
   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(
-    const DeterminedFrameIdCallback& callback) {
+void WebRequestEventDetails::DetermineFrameDataOnIO(
+    const DeterminedFrameDataCallback& callback) {
   std::unique_ptr<WebRequestEventDetails> self(this);
   ExtensionApiFrameIdMap::Get()->GetFrameDataOnIO(
       render_process_id_, render_frame_id_,
-      base::Bind(&WebRequestEventDetails::OnDeterminedFrameId,
+      base::Bind(&WebRequestEventDetails::OnDeterminedFrameData,
                  base::Unretained(this), base::Passed(&self), callback));
 }
 
 std::unique_ptr<base::DictionaryValue> WebRequestEventDetails::GetFilteredDict(
     int extra_info_spec) const {
   std::unique_ptr<base::DictionaryValue> result = dict_.CreateDeepCopy();
   if ((extra_info_spec & ExtraInfoSpec::REQUEST_BODY) && request_body_)
     result->Set(keys::kRequestBodyKey, request_body_->CreateDeepCopy());
   if ((extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS) && request_headers_)
     result->Set(keys::kRequestHeadersKey, request_headers_->CreateDeepCopy());
   if ((extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) && response_headers_)
     result->Set(keys::kResponseHeadersKey, response_headers_->CreateDeepCopy());
   return result;
 }
 
 std::unique_ptr<base::DictionaryValue>
 WebRequestEventDetails::GetAndClearDict() {
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   dict_.Swap(result.get());
   return result;
 }
 
-void WebRequestEventDetails::OnDeterminedFrameId(
+void WebRequestEventDetails::OnDeterminedFrameData(
     std::unique_ptr<WebRequestEventDetails> self,
-    const DeterminedFrameIdCallback& callback,
+    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