webRequest: Set frameId on beacon/ping requests.

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 163 matching lines @@
 // a request with the given details. If the method returns true, the event
 // should be ignored.
 function isUnexpectedDetachedRequest(name, details) {
   // This function is responsible for marking detached requests as unexpected.
   // Non-detached requests are not this function's concern.
   if (details.tabId !== -1 || details.frameId >= 0)
     return false;
 
   // Only return true if there is no matching expectation for the given details.
   return !expectedEventData.some(function(exp) {
+    var didMatchTabAndFrameId =
+      exp.details.tabId === -1 &&
+      exp.details.frameId === -1;
+
+    // Accept non-matching tabId/frameId for ping/beacon requests because these
+    // requests can continue after a frame is removed. And due to a bug, such
+    // requests have a tabId/frameId of -1.
+    // The test will fail anyway, but then with a helpful error (expectation
+    // differs from actual events) instead of an obscure test timeout.
+    // TODO(robwu): Remove this once https://crbug.com/522129 gets fixed.
+    didMatchTabAndFrameId = didMatchTabAndFrameId || details.type === 'ping';
+
     return name === exp.event &&
-      exp.details.tabId === -1 &&
-      exp.details.frameId === -1 &&
+      didMatchTabAndFrameId &&
       exp.details.method === details.method &&
       exp.details.url === details.url &&
       exp.details.type === details.type;
   });
 }
 
 function captureEvent(name, details, callback) {
   // Ignore system-level requests like safebrowsing updates and favicon fetches
   // since they are unpredictable.
   if (details.type == "other" ||
@@ skipping 205 matching lines @@
   helper('onHeadersReceived');
   helper('onResponseStarted');
   helper('onBeforeRedirect');
   helper('onCompleted');
   helper('onErrorOccurred');
 }
 
 function resetDeclarativeRules() {
   chrome.declarativeWebRequest.onRequest.removeRules();
 }