summaryrefslogtreecommitdiffstats
path: root/chrome/test/data
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 17:36:20 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 17:36:20 +0000
commit7469188609cb06b487f04139bfc6cbc7504ca3e4 (patch)
treea6393552fefb5cf368a78d215e62f5e9bb5f04de /chrome/test/data
parent0f1fd858ccc4f6f472d33e7e5f11bab40e86f0a1 (diff)
downloadchromium_src-7469188609cb06b487f04139bfc6cbc7504ca3e4.zip
chromium_src-7469188609cb06b487f04139bfc6cbc7504ca3e4.tar.gz
chromium_src-7469188609cb06b487f04139bfc6cbc7504ca3e4.tar.bz2
Fix SSLUITest.TestUnsafeContentsInWorker*.
These still expected fixed port testserver's, but were undetected as failing since marked FLAKY. BUG=64785 TEST=browser_tests --gtest_filter="*TestUnsafeContentsInWorker*" Review URL: http://codereview.chromium.org/5472001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
-rw-r--r--chrome/test/data/ssl/page_with_unsafe_worker.html2
-rw-r--r--chrome/test/data/ssl/unsafe_worker.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/data/ssl/page_with_unsafe_worker.html b/chrome/test/data/ssl/page_with_unsafe_worker.html
index db8dbfb..1c6bb56 100644
--- a/chrome/test/data/ssl/page_with_unsafe_worker.html
+++ b/chrome/test/data/ssl/page_with_unsafe_worker.html
@@ -14,7 +14,7 @@ function IsContentLoaded() {
var worker;
function test() {
- worker = new Worker("unsafe_worker.js");
+ worker = new Worker("REPLACE_WITH_UNSAFE_WORKER_PATH");
worker.onmessage = function(e) {
isContentLoaded = (e.data == "loaded");
isWorkerFinished = true;
diff --git a/chrome/test/data/ssl/unsafe_worker.js b/chrome/test/data/ssl/unsafe_worker.js
index 984223d..1ad6792 100644
--- a/chrome/test/data/ssl/unsafe_worker.js
+++ b/chrome/test/data/ssl/unsafe_worker.js
@@ -1,6 +1,6 @@
var message = "failed";
try {
- importScripts("https://127.0.0.1:9666/files/ssl/imported.js");
+ importScripts("REPLACE_WITH_IMPORTED_JS_URL");
} catch(ex) {
}
postMessage(message);