Revert "Allow extensions to redirect requests in onBeforeRequest."

The change introduced a regression in the WebRequestEvents api test.
TBR=mpcomplete

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81503 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 38 deletions

diff --git a/chrome/test/data/extensions/api_test/webrequest/events/test.html b/chrome/test/data/extensions/api_test/webrequest/events/test.html
index 95b47b4..60eec41 100644
--- a/chrome/test/data/extensions/api_test/webrequest/events/test.html
+++ b/chrome/test/data/extensions/api_test/webrequest/events/test.html
@@ -46,50 +46,47 @@ function captureEvent(name, details) {
       details.url.match(/\/favicon.ico$/))
     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;
-  if (expectedEventData.length >= currentIndex) {
-    extraOptions = expectedEventData[currentIndex][2];
-    expectedEventData[currentIndex].splice(2, 1);
-  }
-
   delete details.requestId;
   delete details.timeStamp;
   capturedEventData.push([name, details]);
   checkExpectations();
-  return extraOptions ? extraOptions.retval : undefined;
 }
 
 function initListeners(filter, extraInfoSpec) {
   chrome.experimental.webRequest.onBeforeRequest.addListener(
       function(details) {
-    return captureEvent("onBeforeRequest", details);
+    captureEvent("onBeforeRequest", details);
+    return {cancel: true};  // no effect unless event is blocking.
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onBeforeSendHeaders.addListener(
       function(details) {
-    return captureEvent("onBeforeSendHeaders", details);
+    captureEvent("onBeforeSendHeaders", details);
+    return {cancel: true};  // no effect unless event is blocking.
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onRequestSent.addListener(
       function(details) {
-    return captureEvent("onRequestSent", details);
+    captureEvent("onRequestSent", details);
+    return {cancel: true};
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onHeadersReceived.addListener(
       function(details) {
-    return captureEvent("onHeadersReceived", details);
+    captureEvent("onHeadersReceived", details);
+    return {cancel: true};
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onBeforeRedirect.addListener(
       function(details) {
-    return captureEvent("onBeforeRedirect", details);
+    captureEvent("onBeforeRedirect", details);
+    return {cancel: true};
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onCompleted.addListener(
       function(details) {
-    return captureEvent("onCompleted", details);
+    captureEvent("onCompleted", details);
+    return {cancel: true};
   }, filter, extraInfoSpec);
   chrome.experimental.webRequest.onErrorOccurred.addListener(
       function(details) {
-    return captureEvent("onErrorOccurred", details);
+    captureEvent("onErrorOccurred", details);
+    return {cancel: true};
   }, filter, extraInfoSpec);
 }
 
@@ -185,7 +182,7 @@ runTests([
   // Navigates to a page with subresources, with a blocking handler that
   // cancels the page request. The page will not load, and we should not
   // see the subresources.
-  function complexLoadCancelled() {
+  function complexLoadBlocking() {
     expect([
       [ "onBeforeRequest",
         {
@@ -193,26 +190,7 @@ runTests([
           tabId: tabId,
           type: "main_frame",
           url: getURL("complexLoad/a.html")
-        },
-        { retval: {cancel: true} }
-      ]
-    ], {}, ["blocking"]);
-    chrome.tabs.update(tabId, { url: getURL("complexLoad/a.html") });
-  },
-
-  // Navigates to a page with a blocking handler that redirects to a different
-  // page.
-  // TODO(mpcomplete): will get an onBeforeRedirect event for the new request.
-  function complexLoadRedirected() {
-    expect([
-      [ "onBeforeRequest",
-        {
-          method: "GET",
-          tabId: tabId,
-          type: "main_frame",
-          url: getURL("complexLoad/a.html")
-        },
-        { retval: {redirectUrl: getURL("simpleLoad/a.html")} }
+        }
       ]
     ], {}, ["blocking"]);
     chrome.tabs.update(tabId, { url: getURL("complexLoad/a.html") });