summaryrefslogtreecommitdiffstats
path: root/chrome/test/data/extensions
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 10:35:43 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 10:35:43 +0000
commit52d896b54117b5ccc5bf4d4783421b713f5e652e (patch)
treed44581fb83bbbe3a12262504948d71de1b5d602d /chrome/test/data/extensions
parentb33061331c6c632bd5aa51de7db8b96452bb0299 (diff)
downloadchromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.zip
chromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.tar.gz
chromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.tar.bz2
Enable TransferNavigationResourceHandler
This enables a fix for bug 79520 that was previously committed but not enabled http://src.chromium.org/viewvc/chrome?view=rev&revision=112847. BUG=79520 TEST=no TBR=jam@chromium.org Review URL: http://codereview.chromium.org/8889007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/extensions')
-rw-r--r--chrome/test/data/extensions/api_test/webrequest/test_blocking.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/test/data/extensions/api_test/webrequest/test_blocking.js b/chrome/test/data/extensions/api_test/webrequest/test_blocking.js
index 903978e..9c5925d 100644
--- a/chrome/test/data/extensions/api_test/webrequest/test_blocking.js
+++ b/chrome/test/data/extensions/api_test/webrequest/test_blocking.js
@@ -126,9 +126,6 @@ runTests([
// Navigates to a page with a blocking handler that redirects to a different
// page.
- // TODO(mpcomplete): We should see an onBeforeRedirect as well, but our
- // process switching logic cancels the original redirect request and
- // starts a new one instead. See http://crbug.com/79520.
function complexLoadRedirected() {
expect(
[ // events
@@ -140,13 +137,14 @@ runTests([
},
retval: {redirectUrl: getURL("simpleLoad/a.html")}
},
- { label: "onErrorOccurred-1",
- event: "onErrorOccurred",
+ { label: "onBeforeRedirect",
+ event: "onBeforeRedirect",
details: {
url: getURL("complexLoad/a.html"),
+ redirectUrl: getURL("simpleLoad/a.html"),
+ statusLine: "",
+ statusCode: -1,
fromCache: false,
- error: "net::ERR_ABORTED"
- // Request to chrome-extension:// url has no IP.
}
},
{ label: "onBeforeRequest-2",
@@ -178,7 +176,7 @@ runTests([
},
],
[ // event order
- ["onBeforeRequest-1", "onErrorOccurred-1", "onBeforeRequest-2",
+ ["onBeforeRequest-1", "onBeforeRedirect", "onBeforeRequest-2",
"onResponseStarted", "onCompleted"],
],
{urls: ["<all_urls>"]}, // filter
@@ -459,7 +457,6 @@ runTests([
responseHeadersExist: true,
},
retval_function: function(name, details) {
- console.log(JSON.stringify(details));
responseHeaders = details.responseHeaders;
var found = false;
var expectedValue = [