Refactor the implementation of the webNavigation extension API.

extensions/browser/extension_api_frame_id_map.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_
 #define EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 
 namespace content {
+class NavigationHandle;
 class RenderFrameHost;
 class WebContents;
 }  // namespace content
 
 namespace extensions {
 
 // Extension frame IDs are exposed through the chrome.* APIs and have the
 // following characteristics:
 // - The top-level frame has ID 0.
 // - Any child frame has a positive ID.
@@ skipping 19 matching lines @@
                           int extension_api_parent_frame_id)>;
 
   // An invalid extension API frame ID.
   static const int kInvalidFrameId;
 
   static ExtensionApiFrameIdMap* Get();
 
   // Get the extension API frame ID for |rfh|.
   static int GetFrameId(content::RenderFrameHost* rfh);
 
+  // Get the extension API frame ID for |navigation_handle|.
+  static int GetFrameId(content::NavigationHandle* navigation_handle);
+
   // Get the extension API frame ID for the parent of |rfh|.
   static int GetParentFrameId(content::RenderFrameHost* rfh);
 
+  // Get the extension API frame ID for the parent of |navigation_handle|.
+  static int GetParentFrameId(content::NavigationHandle* navigation_handle);
+
   // Find the current RenderFrameHost for a given WebContents and extension
   // frame ID.
   // Returns nullptr if not found.
   static content::RenderFrameHost* GetRenderFrameHostById(
       content::WebContents* web_contents,
       int frame_id);
 
   // Runs |callback| with the result that is equivalent to calling GetFrameId()
   // on the UI thread. Thread hopping is minimized if possible. Callbacks for
   // the same |render_process_id| and |frame_routing_id| are guaranteed to be
@@ skipping 90 matching lines @@
   // This lock protects |frame_id_map_| from being concurrently written on the
   // UI thread and read on the IO thread.
   base::Lock frame_id_map_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionApiFrameIdMap);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_