Rename WorkerThread to WorkerScript

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
index b022a24b3435027138a4c151d9e74b186111e5f4..d238e520f487c58d487e6cfaf64d64da795593da 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
@@ -42,13 +42,13 @@
 #include "core/loader/FrameLoader.h"
 #include "core/page/Page.h"
 #include "core/workers/SharedWorkerGlobalScope.h"
-#include "core/workers/SharedWorkerThread.h"
+#include "core/workers/SharedWorkerScript.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerInspectorProxy.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
-#include "core/workers/WorkerThreadStartupData.h"
+#include "core/workers/WorkerScriptStartupData.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/heap/Handle.h"
@@ -102,7 +102,7 @@ WebSharedWorkerImpl::~WebSharedWorkerImpl()
         m_loaderProxy->detachProvider(this);
 }
 
-void WebSharedWorkerImpl::terminateWorkerThread()
+void WebSharedWorkerImpl::terminateWorkerScript()
 {
     if (m_askedToTerminate)
         return;
@@ -114,9 +114,9 @@ void WebSharedWorkerImpl::terminateWorkerThread()
         delete this;
         return;
     }
-    if (m_workerThread)
-        m_workerThread->terminate();
-    m_workerInspectorProxy->workerThreadTerminated();
+    if (m_workerScript)
+        m_workerScript->terminate();
+    m_workerInspectorProxy->workerScriptTerminated();
 }
 
 void WebSharedWorkerImpl::initializeLoader()
@@ -244,19 +244,19 @@ void WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread()
 {
     m_client->workerContextClosed();
 
-    terminateWorkerThread();
+    terminateWorkerScript();
 }
 
 void WebSharedWorkerImpl::workerGlobalScopeStarted(WorkerGlobalScope*)
 {
 }
 
-void WebSharedWorkerImpl::workerThreadTerminated()
+void WebSharedWorkerImpl::workerScriptTerminated()
 {
-    Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, AllowCrossThreadAccess(this)));
+    Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerScriptTerminatedOnMainThread, AllowCrossThreadAccess(this)));
 }
 
-void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread()
+void WebSharedWorkerImpl::workerScriptTerminatedOnMainThread()
 {
     m_client->workerContextDestroyed();
     // The lifetime of this proxy is controlled by the worker context.
@@ -272,13 +272,13 @@ void WebSharedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> task
 
 bool WebSharedWorkerImpl::postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task)
 {
-    m_workerThread->postTask(BLINK_FROM_HERE, task);
+    m_workerScript->postTask(BLINK_FROM_HERE, task);
     return true;
 }
 
 void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel)
 {
-    workerThread()->postTask(
+    workerScript()->postTask(
         BLINK_FROM_HERE, createCrossThreadTask(&connectTask, adoptPtr(webChannel)));
 }
 
@@ -322,7 +322,7 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
     }
 
     Document* document = m_mainFrame->frame()->document();
-    WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
+    WorkerScriptStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
     if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(document))
         startMode = PauseWorkerGlobalScopeOnStart;
 
@@ -334,7 +334,7 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
     WebSecurityOrigin webSecurityOrigin(m_loadingDocument->securityOrigin());
     provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(m_client->createWorkerContentSettingsClientProxy(webSecurityOrigin)));
     RefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy = m_mainScriptLoader->releaseContentSecurityPolicy();
-    OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(
+    OwnPtr<WorkerScriptStartupData> startupData = WorkerScriptStartupData::create(
         m_url,
         m_loadingDocument->userAgent(),
         m_mainScriptLoader->script(),
@@ -344,18 +344,18 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
         starterOrigin,
         workerClients.release());
     m_loaderProxy = WorkerLoaderProxy::create(this);
-    setWorkerThread(SharedWorkerThread::create(m_name, m_loaderProxy, *this));
+    setWorkerScript(SharedWorkerScript::create(m_name, m_loaderProxy, *this));
     InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script());
     m_mainScriptLoader.clear();
 
-    workerThread()->start(startupData.release());
-    m_workerInspectorProxy->workerThreadCreated(m_loadingDocument.get(), workerThread(), m_url);
+    workerScript()->start(startupData.release());
+    m_workerInspectorProxy->workerScriptCreated(m_loadingDocument.get(), workerScript(), m_url);
     m_client->workerScriptLoaded();
 }
 
 void WebSharedWorkerImpl::terminateWorkerContext()
 {
-    terminateWorkerThread();
+    terminateWorkerScript();
 }
 
 void WebSharedWorkerImpl::pauseWorkerContextOnStart()