Support WebSocket in WebRequest API.

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;
 var tabId;
 var tabIdMap;
 var frameIdMap;
+var testWebSocketPort;
 var testServerPort;
 var testServer = "www.a.com";
 var defaultScheme = "http";
 var eventsCaptured;
 var listeners = {
   'onBeforeRequest': [],
   'onBeforeSendHeaders': [],
   'onAuthRequired': [],
   'onSendHeaders': [],
   'onHeadersReceived': [],
@@ skipping 14 matching lines @@
 
 function runTests(tests) {
   var waitForAboutBlank = function(_, info, tab) {
     if (info.status == "complete" && tab.url == "about:blank") {
       tabId = tab.id;
       tabIdMap = {"-1": -1};
       tabIdMap[tabId] = 0;
       chrome.tabs.onUpdated.removeListener(waitForAboutBlank);
       chrome.test.getConfig(function(config) {
         testServerPort = config.testServer.port;
+        testWebSocketPort = config.testWebSocketPort;
         chrome.test.runTests(tests);
       });
     }
   };
   chrome.tabs.onUpdated.addListener(waitForAboutBlank);
   chrome.tabs.create({url: "about:blank"});
 }
 
 // Returns an URL from the test server, fixing up the port. Must be called
 // from within a test case passed to runTests.
@@ skipping 139 matching lines @@
       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" && !details.url.includes('dont-ignore-me')) ||
+  // TODO(pkalinnikov): Remove the startsWith('ws') check once a new type gets
+  // intoduced for the WebSocket requests.

[tyoshino (SeeGerritForStatus), 2016/12/06 08:05:06]

introduced

[pkalinnikov, 2016/12/13 21:15:59]

Done.

+  if ((details.type == "other" && !details.url.includes('dont-ignore-me') &&
+       !details.url.startsWith('ws')) ||
       isUnexpectedDetachedRequest(name, details) ||
       details.url.match(/\/favicon.ico$/) ||
-      details.url.match(/https:\/\/dl.google.com/))
+      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) {
     retval =
         expectedEventData[currentIndex].retval_function ?
         expectedEventData[currentIndex].retval_function(name, details) :
@@ skipping 191 matching lines @@
   helper('onHeadersReceived');
   helper('onResponseStarted');
   helper('onBeforeRedirect');
   helper('onCompleted');
   helper('onErrorOccurred');
 }
 
 function resetDeclarativeRules() {
   chrome.declarativeWebRequest.onRequest.removeRules();
 }