Use FrameTreeNode ID as frameId in extension APIs

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 "base/callback.h"
+
+namespace content {
+class RenderFrameHost;
+class WebContents;
+}  // namespace content
+
+namespace extensions {
+
+// Extension frame IDs are exposed through the extension API and have the

[Devlin, 2015/12/10 21:53:07]

"the extension API"?  That sounds like chrome.extension.  Maybe just "through
APIs" (extension can be implied).

[robwu, 2015/12/11 00:53:48]

Changed to "through the chrome.* APIs"

+// following characteristics:
+// - The top-level frame has ID 0.
+// - Any child frame has a positive ID.
+// - A non-existant frame has ID -1.
+// - They are only guaranteed to be unique within a tab.
+// - Multiple RenderFrameHosts may be mapped to the same ID.
+struct ExtensionApiFrameId {
+  static const int kInvalidFrameId = -1;
+  ExtensionApiFrameId();
+
+  // The name "ExtensionApiFrameId" refers to |frame_id|.
+  int frame_id;
+
+  // The extension frame ID of the parent frame ID is also included because
+  // some extension APIs need both IDs.
+  int parent_frame_id;
+};
+
+// This class provides a mapping from a (render_process_id, frame_routing_id)
+// pair that maps a RenderFrameHost to an extension frame ID.
+class ExtensionApiFrameIdMap {

[Devlin, 2015/12/10 21:53:07]

Does this class warrant a few small unit tests?

[robwu, 2015/12/11 00:53:48]

The functionality is already covered by the consumers and their api tests + unit
tests, and I was being lazy here because I did not know whether my approach
would be accepted.

I'll add a few simple tests for the following scenarios:
- Call GetFrameIdOnIO on IO thread.
- Call GetFrameId on UI thread.
- Call both methods concurrently on the IO and IO thread.
- Verify result of GetRenderFrameHostById.

I haven't written tests that ran on both the IO and UI thread before, but I'll
work it out.

+ public:
+  typedef base::Callback<void(const ExtensionApiFrameId&)> FrameIdCallback;

[Devlin, 2015/12/10 21:53:07]

nit: Prefer using.

[robwu, 2015/12/11 00:53:48]

Done.

+
+  // Runs |callback| with the result that is equivalent to calling GetFrameId()
+  // on the UI thread. If the result was cached the callback is immediately run.
+  // Otherwise the callback is queued and run in order when the result becomes
+  // available. Queued callbacks are not called when the class is destroyed.
+  // Can only be called on the IO thread.
+  static void GetFrameIdOnIO(int render_process_id,
+                             int frame_routing_id,
+                             FrameIdCallback callback);

[Devlin, 2015/12/10 21:53:07]

const &

[robwu, 2015/12/11 00:53:48]

Done.

+
+  // Get the frameId for a RenderFrameHost identified by |render_process_id| and
+  // |frame_routing_id|. These methods always returns the same value when called
+  // with the same parameters.
+  // Can only be called on the UI thread.
+  static const ExtensionApiFrameId& GetFrameId(int render_process_id,
+                                               int frame_routing_id);
+  static const ExtensionApiFrameId& GetFrameId(content::RenderFrameHost* rfh);
+
+  // Find a RenderFrameHost for a given extension frame ID and WebContents.
+  // Returns nullptr if not found.
+  static content::RenderFrameHost* GetRenderFrameHostById(
+      content::WebContents* web_contents,
+      int frame_id);
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_