Use FrameTreeNode ID as frameId in extension APIs

chrome/test/data/extensions/api_test/webrequest/framework.js

 // 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.
 
 var getURL = chrome.extension.getURL;
 var deepEq = chrome.test.checkDeepEq;
 var expectedEventData;
 var capturedEventData;
 var capturedUnexpectedData;
 var expectedEventOrder;
@@ skipping 173 matching lines @@
     return name === exp.event &&
       exp.details.tabId === -1 &&
       exp.details.frameId === -1 &&
       exp.details.method === details.method &&
       exp.details.url === details.url &&
       exp.details.type === details.type;
   });
 }
 
 function captureEvent(name, details, callback) {
-  // frameId should be -1 or positive, but is sometimes -2 (MSG_ROUTING_NONE).
-  // TODO(robwu): This will be resolved once crbug.com/432875 is resolved.
-  if (details.frameId === -2)
-    details.frameId = -1;
-
   // Ignore system-level requests like safebrowsing updates and favicon fetches
   // since they are unpredictable.
   if (details.type == "other" ||
       isUnexpectedDetachedRequest(name, details) ||
       details.url.match(/\/favicon.ico$/) ||
       details.url.match(/https:\/\/dl.google.com/))
     return;
 
   // Pull the extra per-event options out of the expected data. These let
   // us specify special return values per event.
@@ skipping 198 matching lines @@
   helper('onHeadersReceived');
   helper('onResponseStarted');
   helper('onBeforeRedirect');
   helper('onCompleted');
   helper('onErrorOccurred');
 }
 
 function resetDeclarativeRules() {
   chrome.declarativeWebRequest.onRequest.removeRules();
 }