Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / worker_host / worker_service_impl.cc

diff --git a/src/content/browser/worker_host/worker_service_impl.cc b/src/content/browser/worker_host/worker_service_impl.cc
index d17f440..4636777 100644 (file)
--- a/src/content/browser/worker_host/worker_service_impl.cc
+++ b/src/content/browser/worker_host/worker_service_impl.cc
@@ -236,9 +236,9 @@ WorkerService* WorkerService::GetInstance() {
 }
 
 bool WorkerService::EmbeddedSharedWorkerEnabled() {
-  static bool enabled = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableEmbeddedSharedWorker);
-  return enabled;
+  static bool disabled = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableEmbeddedSharedWorker);
+  return !disabled;
 }
 
 WorkerServiceImpl* WorkerServiceImpl::GetInstance() {
@@ -409,12 +409,13 @@ bool WorkerServiceImpl::CreateWorkerFromInstance(
     return false;
   }
 
-  worker->CreateWorker(instance);
+  worker->CreateWorker(
+      instance,
+      WorkerDevToolsManager::GetInstance()->WorkerCreated(worker, instance));
   FOR_EACH_OBSERVER(
       WorkerServiceObserver, observers_,
       WorkerCreated(instance.url(), instance.name(), worker->GetData().id,
                     instance.worker_route_id()));
-  WorkerDevToolsManager::GetInstance()->WorkerCreated(worker, instance);
   return true;
 }