Revert 95986 - Add support for XMLHttpRequests to the webRequest API

chrome/test/data/extensions/api_test/webrequest/events/test.html

 <script>
 var getURL = chrome.extension.getURL;
 var deepEq = chrome.test.checkDeepEq;
 var expectedEventData;
 var capturedEventData;
 var expectedEventOrder;
 var tabId;
 var eventsCaptured;
 
 // PORT will be changed to the port of the test server.
 var URL_HTTP_SIMPLE_LOAD =
     'http://www.a.com:PORT/files/extensions/api_test/webrequest/events/simpleLoad/a.html';
 var URL_HTTP_SIMPLE_LOAD_REDIRECT =
     'http://www.a.com:PORT/server-redirect?'+URL_HTTP_SIMPLE_LOAD;
 var URL_ECHO_USER_AGENT =
     'http://www.a.com:PORT/echoheader?User-Agent';
 var URL_AUTH_REQUIRED =
     'http://www.a.com:PORT/auth-basic';
-var URL_HTTP_XHR =
-    'http://www.a.com:PORT/files/extensions/api_test/webrequest/events/xhr/a.html';
-var URL_HTTP_XHR_DATA =
-    'http://www.a.com:PORT/files/extensions/api_test/webrequest/events/xhr/data.json';
 
 function runTests(tests) {
   chrome.tabs.getSelected(null, function(tab) {
     tabId = tab.id;
     chrome.test.getConfig(function(config) {
       var fixPort = function(url) {
         return url.replace(/PORT/g, config.testServer.port);
       };
       URL_HTTP_SIMPLE_LOAD = fixPort(URL_HTTP_SIMPLE_LOAD);
       URL_HTTP_SIMPLE_LOAD_REDIRECT = fixPort(URL_HTTP_SIMPLE_LOAD_REDIRECT);
       URL_ECHO_USER_AGENT = fixPort(URL_ECHO_USER_AGENT);
       URL_AUTH_REQUIRED = fixPort(URL_AUTH_REQUIRED);
-      URL_HTTP_XHR = fixPort(URL_HTTP_XHR);
-      URL_HTTP_XHR_DATA = fixPort(URL_HTTP_XHR_DATA);
 
       chrome.test.runTests(tests);
     });
   });
 }
 
 // Helper to advance to the next test only when the tab has finished loading.
 // This is because tabs.update can sometimes fail if the tab is in the middle
 // of a navigation (from the previous test), resulting in flakiness.
 function navigateAndWait(url, callback) {
@@ skipping 334 matching lines @@
       [  // event order
         ["onBeforeRequest-1", "onBeforeSendHeaders-1", "onSendHeaders-1",
          "onBeforeRedirect",
          "onBeforeRequest-2", "onBeforeSendHeaders-2", "onSendHeaders-2",
          "onResponseStarted", "onCompleted"] ],
       {},  // filter
       ["requestHeaders", "responseHeaders", "statusLine"]);
     navigateAndWait(URL_HTTP_SIMPLE_LOAD_REDIRECT);
   },
 
-  // Navigates to a page to generates an XHR.
-  function xhrLoad() {
-    expect(
-      [  // events
-        { label: "onBeforeRequest-1",
-          event: "onBeforeRequest",
-          details: {
-            method: "GET",
-            tabId: tabId,
-            type: "main_frame",
-            url: URL_HTTP_XHR,
-            frameUrl: URL_HTTP_XHR
-          }
-        },
-        { label: "onBeforeSendHeaders-1",
-          event: "onBeforeSendHeaders",
-          details: {
-            url: URL_HTTP_XHR,
-          }
-        },
-        { label: "onSendHeaders-1",
-          event: "onSendHeaders",
-          details: {
-            url: URL_HTTP_XHR,
-          }
-        },
-        { label: "onResponseStarted-1",
-          event: "onResponseStarted",
-          details: {
-            url: URL_HTTP_XHR,
-            statusCode: 200,
-            ip: "127.0.0.1",
-            fromCache: false,
-          }
-        },
-        { label: "onCompleted-1",
-          event: "onCompleted",
-          details: {
-            url: URL_HTTP_XHR,
-            statusCode: 200,
-            ip: "127.0.0.1",
-            fromCache: false,
-          }
-        },
-        { label: "onBeforeRequest-2",
-          event: "onBeforeRequest",
-          details: {
-            method: "GET",
-            tabId: tabId,
-            type: "xmlhttprequest",
-            url: URL_HTTP_XHR_DATA,
-            frameUrl: URL_HTTP_XHR
-          }
-        },
-        { label: "onBeforeSendHeaders-2",
-          event: "onBeforeSendHeaders",
-          details: {
-            url: URL_HTTP_XHR_DATA,
-          }
-        },
-        { label: "onSendHeaders-2",
-          event: "onSendHeaders",
-          details: {
-            url: URL_HTTP_XHR_DATA,
-          }
-        },
-        { label: "onResponseStarted-2",
-          event: "onResponseStarted",
-          details: {
-            url: URL_HTTP_XHR_DATA,
-            statusCode: 200,
-            ip: "127.0.0.1",
-            fromCache: false,
-          }
-        },
-        { label: "onCompleted-2",
-          event: "onCompleted",
-          details: {
-            url: URL_HTTP_XHR_DATA,
-            statusCode: 200,
-            ip: "127.0.0.1",
-            fromCache: false,
-          }
-        }
-      ],
-      [  // event order
-        ["onBeforeRequest-1", "onBeforeSendHeaders-1", "onSendHeaders-1",
-         "onResponseStarted-1", "onCompleted-1",
-         "onBeforeRequest-2", "onBeforeSendHeaders-2", "onSendHeaders-2",
-         "onResponseStarted-2", "onCompleted-2"] ],
-      {}, []);
-    navigateAndWait(URL_HTTP_XHR);
-  },
-
   // Navigates to a page with subresources.
   // TODO(mpcomplete): add multiple subresources; requires support for
   // recognizing partial ordering.
   function complexLoad() {
     expect(
       [  // events
         { label: "a.html-onBeforeRequest",
           event: "onBeforeRequest",
           details: {
             method: "GET",
@@ skipping 424 matching lines @@
       ],
       [  // event order
         ["onBeforeRequest", "onBeforeSendHeaders", "onSendHeaders",
          "onAuthRequired", "onResponseStarted", "onCompleted"]
       ],
       {}, []);
     navigateAndWait(URL_AUTH_REQUIRED);
   },
 ]);
 </script>