Use FrameTreeNode ID as frameId in extension APIs

chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

 // Copyright (c) 2012 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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/web_navigation.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_api_frame_id_map.h"
 #include "extensions/common/event_filtering_info.h"
 #include "net/base/net_errors.h"
 #include "ui/base/page_transition_types.h"
 
 namespace extensions {
 
 namespace keys = web_navigation_api_constants;
 namespace web_navigation = api::web_navigation;
 
 namespace web_navigation_api_helpers {
@@ skipping 21 matching lines @@
         new Event(histogram_value, event_name, args.Pass()));
     event->restrict_to_browser_context = profile;
     event->filter_info = info;
     event_router->BroadcastEvent(event.Pass());
   }
 }
 
 }  // namespace
 
 int GetFrameId(content::RenderFrameHost* frame_host) {
-  if (!frame_host)
-    return -1;
-  return !frame_host->GetParent() ? 0 : frame_host->GetRoutingID();
+  return ExtensionApiFrameIdMap::GetFrameId(frame_host).frame_id;
 }
 
 // Constructs and dispatches an onBeforeNavigate event.
-// TODO(dcheng): Is the parent process ID needed here? http://crbug.com/393640
-// Collisions are probably possible... but maybe this won't ever happen because
-// of the SiteInstance grouping policies.
 void DispatchOnBeforeNavigate(content::WebContents* web_contents,
                               content::RenderFrameHost* frame_host,
                               const GURL& validated_url) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, validated_url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
   dict->SetInteger(keys::kParentFrameIdKey,
@@ skipping 154 matching lines @@
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(browser_context, events::WEB_NAVIGATION_ON_TAB_REPLACED,
                 web_navigation::OnTabReplaced::kEventName, args.Pass(), GURL());
 }
 
 }  // namespace web_navigation_api_helpers
 
 }  // namespace extensions