diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:25:33 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:25:33 +0000 |
| commit | f1a63d5f6bef794c761447e7dc7b1415b133bdb3 (patch) | |
| tree | 297e66d439d262c54a22b0360aa6241082018d2e /chrome/test | |
| parent | c1443d84cafab2dc81650715b102afe4d28cb27b (diff) | |
| download | chromium_src-f1a63d5f6bef794c761447e7dc7b1415b133bdb3.zip chromium_src-f1a63d5f6bef794c761447e7dc7b1415b133bdb3.tar.gz chromium_src-f1a63d5f6bef794c761447e7dc7b1415b133bdb3.tar.bz2 | |
Revert "First steps towards webRequest extension API."
Seems to have broken the sync_integration_tests.
This reverts commit d6f8d16cd6a5ebdf019c4755e7d42aee8136abf1.
TBR=aa
BUG=60101
TEST=no
Review URL: http://codereview.chromium.org/6287029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
7 files changed, 0 insertions, 112 deletions
diff --git a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/a.html b/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/a.html deleted file mode 100644 index eabe7b8..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/a.html +++ /dev/null @@ -1 +0,0 @@ -<iframe src="b.html"></iframe> diff --git a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.html b/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.html deleted file mode 100755 index 4ef22cc..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.html +++ /dev/null @@ -1 +0,0 @@ -<img src="b.jpg"></a>
diff --git a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.jpg b/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.jpg deleted file mode 100644 index e69de29..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/complexLoad/b.jpg +++ /dev/null diff --git a/chrome/test/data/extensions/api_test/webrequest/events/manifest.json b/chrome/test/data/extensions/api_test/webrequest/events/manifest.json deleted file mode 100644 index 1511d09..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "request", - "version": "1.0", - "description": "Tests the webRequest API events.", - "permissions": ["experimental", "tabs"], - "background_page": "test.html" -} diff --git a/chrome/test/data/extensions/api_test/webrequest/events/simpleLoad/a.html b/chrome/test/data/extensions/api_test/webrequest/events/simpleLoad/a.html deleted file mode 100644 index 18ecdcb..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/simpleLoad/a.html +++ /dev/null @@ -1 +0,0 @@ -<html></html> diff --git a/chrome/test/data/extensions/api_test/webrequest/events/test.html b/chrome/test/data/extensions/api_test/webrequest/events/test.html deleted file mode 100644 index 9d4203b..0000000 --- a/chrome/test/data/extensions/api_test/webrequest/events/test.html +++ /dev/null @@ -1,101 +0,0 @@ -<script> -var expectedEventData; -var capturedEventData; - -function expect(data) { - expectedEventData = data; - capturedEventData = []; -} - -function checkExpectations() { - if (capturedEventData.length < expectedEventData.length) { - return; - } - // TODO(mpcomplete): allow partial ordering of events - chrome.test.assertEq(JSON.stringify(expectedEventData), - JSON.stringify(capturedEventData)); - chrome.test.succeed(); -} - -function captureEvent(name, details) { - // TODO(mpcomplete): implement the rest of the parameters. - delete details.requestId; - delete details.tabId; - delete details.timeStamp; - delete details.type; - capturedEventData.push([name, details]); - checkExpectations(); -} - -chrome.experimental.webRequest.onBeforeRequest.addListener( - function(details) { - captureEvent("onBeforeRequest", details); -}); -chrome.experimental.webRequest.onRequestSent.addListener( - function(details) { - captureEvent("onRequestSent", details); -}); -chrome.experimental.webRequest.onHeadersReceived.addListener( - function(details) { - captureEvent("onHeadersReceived", details); -}); -chrome.experimental.webRequest.onBeforeRedirect.addListener( - function(details) { - captureEvent("onBeforeRedirect", details); -}); -chrome.experimental.webRequest.onCompleted.addListener( - function(details) { - captureEvent("onCompleted", details); -}); -chrome.experimental.webRequest.onErrorOccurred.addListener( - function(details) { - captureEvent("onErrorOccurred", details); -}); - -var getURL = chrome.extension.getURL; -chrome.tabs.getSelected(null, function(tab) { - var tabId = tab.id; - - chrome.test.runTests([ - // Navigates to a blank page. - function simpleLoad() { - expect([ - [ "onBeforeRequest", - { - method: "GET", - url: getURL("simpleLoad/a.html") - } - ], - ]); - chrome.tabs.update(tabId, { url: getURL("simpleLoad/a.html") }); - }, - - // Navigates to a page with subresources. - // TODO(mpcomplete): add multiple subresources; requires support for - // recognizing partial ordering. - function simpleLoad() { - expect([ - [ "onBeforeRequest", - { - method: "GET", - url: getURL("complexLoad/a.html") - } - ], - [ "onBeforeRequest", - { - method: "GET", - url: getURL("complexLoad/b.html") - } - ], - [ "onBeforeRequest", - { - method: "GET", - url: getURL("complexLoad/b.jpg") - } - ], - ]); - chrome.tabs.update(tabId, { url: getURL("complexLoad/a.html") }); - }, - ]); -}); -</script> diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index a9244b7..eaa77e8 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -150,7 +150,6 @@ class TestingProfile : public Profile { virtual ExtensionProcessManager* GetExtensionProcessManager() { return NULL; } virtual ExtensionMessageService* GetExtensionMessageService() { return NULL; } virtual ExtensionEventRouter* GetExtensionEventRouter() { return NULL; } - virtual ExtensionIOEventRouter* GetExtensionIOEventRouter() { return NULL; } virtual SSLHostState* GetSSLHostState() { return NULL; } virtual net::TransportSecurityState* GetTransportSecurityState() { return NULL; |
