summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 19:09:30 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 19:09:30 +0000
commit366184247d8c91492b140321c3be1bc78b3606da (patch)
treeabd5072eaf6b3de5f75424db1e3ba89bd43784d5 /chrome/worker
parentecc4ce517d732b9393b3ff21a20a5f2664b60976 (diff)
downloadchromium_src-366184247d8c91492b140321c3be1bc78b3606da.zip
chromium_src-366184247d8c91492b140321c3be1bc78b3606da.tar.gz
chromium_src-366184247d8c91492b140321c3be1bc78b3606da.tar.bz2
Remove --enable-web-workers command-line switch.
BUG=4361 TEST=many ui/layout tests. Review URL: http://codereview.chromium.org/149114 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_thread.cc3
-rw-r--r--chrome/worker/worker_uitest.cc3
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc
index a6db89d..803fef3 100644
--- a/chrome/worker/worker_thread.cc
+++ b/chrome/worker/worker_thread.cc
@@ -32,9 +32,6 @@ void WorkerThread::Init() {
ChildThread::Init();
webkit_client_.reset(new WorkerWebKitClientImpl);
WebKit::initialize(webkit_client_.get());
-
- // Enable the worker so that the nested worker can be created.
- WebKit::enableWebWorkers();
}
void WorkerThread::CleanUp() {
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index a48c131..3b04c90 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -60,7 +60,6 @@ class WorkerTest : public UITest {
WorkerTest::WorkerTest()
: UITest(), initialized_for_layout_test_(false), test_count_(0) {
- launch_arguments_.AppendSwitch(switches::kEnableWebWorkers);
}
WorkerTest::~WorkerTest() {
@@ -289,7 +288,7 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
TEST_F(WorkerTest, WorkerHttpLayoutTests) {
static const char* kLayoutTestFiles[] = {
- //"text-encoding.html",
+ "text-encoding.html",
"worker-importScripts.html",
"worker-redirect.html",
};