Refactor the implementation of the webNavigation extension API.

extensions/browser/extension_api_frame_id_map.cc

 // Copyright 2015 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/extension_api_frame_id_map.h"
 
 #include <tuple>
 
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 
 namespace extensions {
 
 namespace {
 
 // The map is accessed on the IO and UI thread, so construct it once and never
@@ skipping 37 matching lines @@
 bool ExtensionApiFrameIdMap::RenderFrameIdKey::operator==(
     const RenderFrameIdKey& other) const {
   return render_process_id == other.render_process_id &&
          frame_routing_id == other.frame_routing_id;
 }
 
 ExtensionApiFrameIdMap::ExtensionApiFrameIdMap() {}
 
 ExtensionApiFrameIdMap::~ExtensionApiFrameIdMap() {}
 
+// static
 ExtensionApiFrameIdMap* ExtensionApiFrameIdMap::Get() {
   return g_map_instance.Pointer();
 }
 
+// static
 int ExtensionApiFrameIdMap::GetFrameId(content::RenderFrameHost* rfh) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
   if (!rfh)
     return kInvalidFrameId;
   if (rfh->GetParent())
     return rfh->GetFrameTreeNodeId();
   return 0;  // Main frame.
 }
 
+// static
+int ExtensionApiFrameIdMap::GetFrameId(
+    content::NavigationHandle* navigation_handle) {
+  return navigation_handle->IsInMainFrame()
+             ? 0
+             : navigation_handle->GetFrameTreeNodeId();
+}
+
+// static
 int ExtensionApiFrameIdMap::GetParentFrameId(content::RenderFrameHost* rfh) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
   return rfh ? GetFrameId(rfh->GetParent()) : kInvalidFrameId;
 }
 
+// static
+int ExtensionApiFrameIdMap::GetParentFrameId(
+    content::NavigationHandle* navigation_handle) {
+  if (navigation_handle->IsInMainFrame())
+    return -1;
+
+  if (navigation_handle->IsParentMainFrame())
+    return 0;
+
+  return navigation_handle->GetParentFrameTreeNodeId();
+}
+
+// static
 content::RenderFrameHost* ExtensionApiFrameIdMap::GetRenderFrameHostById(
     content::WebContents* web_contents,
     int frame_id) {
   // Although it is technically possible to map |frame_id| to a RenderFrameHost
   // without WebContents, we choose to not do that because in the extension API
   // frameIds are only guaranteed to be meaningful in combination with a tabId.
   if (!web_contents)
     return nullptr;
 
   if (frame_id == kInvalidFrameId)
@@ skipping 139 matching lines @@
 }
 
 void ExtensionApiFrameIdMap::RemoveFrameId(const RenderFrameIdKey& key) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   base::AutoLock lock(frame_id_map_lock_);
   frame_id_map_.erase(key);
 }
 
 }  // namespace extensions