Turn on shared workers by default

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31982 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 13 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index a44eb55..1c0f695 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -560,7 +560,7 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kDisableWebSockets,
     switches::kDisableLocalStorage,
     switches::kEnableSessionStorage,
-    switches::kEnableSharedWorkers,
+    switches::kDisableSharedWorkers,
     switches::kEnableDesktopNotifications,
     switches::kEnableApplicationCache,
     // We propagate the Chrome Frame command line here as well in case the
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 839ef92..97729c7 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -120,6 +120,9 @@ const char kDisablePopupBlocking[]          = "disable-popup-blocking";
 // disable that check. This switch is used during automated testing.
 const char kDisablePromptOnRepost[]         = "disable-prompt-on-repost";
 
+// Enable shared workers. Functionality not yet complete.
+const char kDisableSharedWorkers[]          = "disable-shared-workers";
+
 // Disable syncing bookmarks to a Google Account.
 const char kDisableSync[]                   = "disable-sync";
 
@@ -220,9 +223,6 @@ const char kEnableSeccompSandbox[]          = "enable-seccomp-sandbox";
 // Enable session storage.  Still buggy.
 const char kEnableSessionStorage[]          = "enable-session-storage";
 
-// Enable shared workers. Functionality not yet complete.
-const char kEnableSharedWorkers[]          = "enable-shared-workers";
-
 // Enables StatsTable, logging statistics to a global named shared memory table.
 const char kEnableStatsTable[]              = "enable-stats-table";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b276a09..001132f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -49,6 +49,7 @@ extern const char kDisableNewTabFirstRun[];
 extern const char kDisablePlugins[];
 extern const char kDisablePopupBlocking[];
 extern const char kDisablePromptOnRepost[];
+extern const char kDisableSharedWorkers[];
 extern const char kDisableSync[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
@@ -78,7 +79,6 @@ extern const char kEnableRemoteFonts[];
 extern const char kEnableRendererAccessibility[];
 extern const char kEnableSeccompSandbox[];
 extern const char kEnableSessionStorage[];
-extern const char kEnableSharedWorkers[];
 extern const char kEnableStatsTable[];
 extern const char kEnableSync[];
 extern const char kEnableTabtastic2[];
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 43c568f..290c011 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -361,8 +361,8 @@ long long RendererWebKitClientImpl::databaseGetFileSize(
 
 WebKit::WebSharedWorkerRepository*
 RendererWebKitClientImpl::sharedWorkerRepository() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableSharedWorkers)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableSharedWorkers)) {
     return &shared_worker_repository_;
   } else {
     return NULL;
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 5449cce..1c3144a 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -16,11 +16,6 @@ class WorkerTest : public UILayoutTest {
  protected:
   virtual ~WorkerTest() { }
 
-  virtual void SetUp() {
-    launch_arguments_.AppendSwitch(switches::kEnableSharedWorkers);
-    UILayoutTest::SetUp();
-  }
-
   void RunTest(const std::wstring& test_case) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
@@ -164,7 +159,6 @@ TEST_F(WorkerTest, SharedWorkerFastLayoutTests) {
 
 TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
-    // Enable when shared workers are working (http://crbug.com/26899)
     "shared-worker-importScripts.html",
     "shared-worker-redirect.html",
     // flakey? BUG 16934 "text-encoding.html",