WebRequest API: add more resource types

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 22 matching lines @@
 var ignoreUnexpected = false;
 
 // This is a debugging aid to print all received events as well as the
 // information whether they were expected.
 var logAllRequests = false;
 
 function runTests(tests) {
   var waitForAboutBlank = function(_, info, tab) {
     if (info.status == "complete" && tab.url == "about:blank") {
       tabId = tab.id;
-      tabIdMap = {};
+      tabIdMap = {"-1": -1};
       tabIdMap[tabId] = 0;
       chrome.tabs.onUpdated.removeListener(waitForAboutBlank);
       chrome.test.getConfig(function(config) {
         testServerPort = config.testServer.port;
         chrome.test.runTests(tests);
       });
     }
   };
   chrome.tabs.onUpdated.addListener(waitForAboutBlank);
   chrome.tabs.create({url: "about:blank"});
@@ skipping 109 matching lines @@
 // Simple check to see that we have a User-Agent header, and that it contains
 // an expected value. This is a basic check that the request headers are valid.
 function checkUserAgent(headers) {
   for (var i in headers) {
     if (headers[i].name.toLowerCase() == "user-agent")
       return headers[i].value.toLowerCase().indexOf("chrome") != -1;
   }
   return false;
 }
 
+// Whether the request is missing a tabId and frameId and we're not expecting
+// a request with the given details.
+function isUnexpectedDetachedRequest(name, details) {

[battre, 2015/12/15 12:53:09]

Could you add some more comments that explain what's going on here?

[robwu, 2015/12/15 13:17:25]

Done.

+  if (details.tabId !== -1 || details.frameId >= 0)
+    return false;
+
+  return expectedEventData.every(function(exp) {
+    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.tabId == -1 || details.type == "other" ||
+  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.
   var currentIndex = capturedEventData.length;
   var extraOptions;
   var retval;
   if (expectedEventData.length > currentIndex) {
@@ skipping 24 matching lines @@
     // Subtract one to discount for {"-1": -1} mapping that always exists.
     // This gives the first frame the ID 0.
     frameIdMap[details.frameId] = Object.keys(frameIdMap).length - 1;
   }
   details.frameId = frameIdMap[details.frameId];
   details.parentFrameId = frameIdMap[details.parentFrameId];
 
   // This assigns unique IDs to newly opened tabs. However, the new IDs are only
   // deterministic, if the order in which the tabs are opened is deterministic.
   if (!(details.tabId in tabIdMap)) {
-    tabIdMap[details.tabId] = Object.keys(tabIdMap).length;
+    // Subtract one because the map is initialized with {"-1": -1}, and the
+    // first tab has ID 0.
+    tabIdMap[details.tabId] = Object.keys(tabIdMap).length - 1;
   }
   details.tabId = tabIdMap[details.tabId];
 
   delete details.requestId;
   delete details.timeStamp;
   if (details.requestHeaders) {
     details.requestHeadersValid = checkUserAgent(details.requestHeaders);
     delete details.requestHeaders;
   }
   if (details.responseHeaders) {
@@ skipping 147 matching lines @@
   helper('onHeadersReceived');
   helper('onResponseStarted');
   helper('onBeforeRedirect');
   helper('onCompleted');
   helper('onErrorOccurred');
 }
 
 function resetDeclarativeRules() {
   chrome.declarativeWebRequest.onRequest.removeRules();
 }