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

9 files changed, 1 insertions, 24 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index b4d763e..fac595f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -273,7 +273,6 @@ bool BrowserRenderProcessHost::Init() {
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kUseLowFragHeapCrt,
-    switches::kEnableWebWorkers,
     switches::kEnableStatsTable,
     switches::kAutoSpellCorrect,
     switches::kDisableAudio,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index df64097..2a789ef 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -437,9 +437,6 @@ const wchar_t kNewFtp[]                        = L"new-ftp";
 // can connect to a channel, provided it knows its name. For debugging purposes.
 const wchar_t kIPCUseFIFO[]                    = L"ipc-use-fifo";
 
-// Enable HTML5 Worker support
-const wchar_t kEnableWebWorkers[]              = L"enable-web-workers";
-
 // Enable Native Web Worker support
 const wchar_t kEnableNativeWebWorkers[]        = L"enable-native-web-workers";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 75e326e..265000a 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -163,7 +163,6 @@ extern const wchar_t kNewFtp[];
 
 extern const wchar_t kIPCUseFIFO[];
 
-extern const wchar_t kEnableWebWorkers[];
 extern const wchar_t kEnableNativeWebWorkers[];
 extern const wchar_t kWebWorkerProcessPerCore[];
 extern const wchar_t kWebWorkerShareProcesses[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 7ccb5b1..abd271da 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -370,9 +370,6 @@ void RenderThread::EnsureWebKitInitialized() {
     WebKit::registerExtension(extensions_v8::PlaybackExtension::Get());
   }
 
-  if (command_line.HasSwitch(switches::kEnableWebWorkers))
-    WebKit::enableWebWorkers();
-
   if (RenderProcess::current()->initialized_media_library())
     WebKit::enableMediaPlayer();
 }
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",
   };
diff --git a/webkit/api/public/WebKit.h b/webkit/api/public/WebKit.h
index 55675a6..a3e8086 100644
--- a/webkit/api/public/WebKit.h
+++ b/webkit/api/public/WebKit.h
@@ -77,9 +77,6 @@ namespace WebKit {
     WEBKIT_API void registerExtension(v8::Extension*,
                                       const WebString& schemeRestriction);
 
-    // Enables HTML5 worker support.
-    WEBKIT_API void enableWebWorkers();
-
     // Enables HTML5 media support.
     WEBKIT_API void enableMediaPlayer();
 
diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp
index 8ecc859..8f61ecc 100644
--- a/webkit/api/src/WebKit.cpp
+++ b/webkit/api/src/WebKit.cpp
@@ -106,13 +106,6 @@ void registerExtension(v8::Extension* extension,
     WebCore::V8Proxy::RegisterExtension(extension, schemeRestriction);
 }
 
-void enableWebWorkers()
-{
-#if ENABLE(WORKERS)
-    WebCore::WorkerContextExecutionProxy::setIsWebWorkersEnabled(true);
-#endif
-}
-
 void enableMediaPlayer()
 {
 #if ENABLE(VIDEO)
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 0c4a033..c5b419b 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -36,7 +36,6 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
         ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
     WebKit::registerExtension(extensions_v8::GearsExtension::Get());
     WebKit::registerExtension(extensions_v8::IntervalExtension::Get());
-    WebKit::enableWebWorkers();
 
     // Load libraries for media and enable the media player.
     FilePath module_path;