Index: Source/web/SharedWorkerRepositoryClientImpl.cpp |
diff --git a/Source/web/SharedWorkerRepositoryClientImpl.cpp b/Source/web/SharedWorkerRepositoryClientImpl.cpp |
index fdc4b63caa7bfdb25cfc9ac67538ba31c58e3f5b..468492ecf38acccb0d2ba0e965df2991f0cd48ef 100644 |
--- a/Source/web/SharedWorkerRepositoryClientImpl.cpp |
+++ b/Source/web/SharedWorkerRepositoryClientImpl.cpp |
@@ -52,8 +52,6 @@ |
#include "public/web/WebSharedWorkerRepositoryClient.h" |
#include "web/WebLocalFrameImpl.h" |
-using namespace blink; |
- |
namespace blink { |
// Callback class that keeps the SharedWorker and WebSharedWorker objects alive while connecting. |
@@ -118,7 +116,7 @@ void SharedWorkerRepositoryClientImpl::connect(PassRefPtrWillBeRawPtr<SharedWork |
// No nested workers (for now) - connect() should only be called from document context. |
ASSERT(worker->executionContext()->isDocument()); |
Document* document = toDocument(worker->executionContext()); |
- OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), worker->executionContext()->contentSecurityPolicy()->deprecatedHeader(), static_cast<blink::WebContentSecurityPolicyType>(worker->executionContext()->contentSecurityPolicy()->deprecatedHeaderType()))); |
+ OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), worker->executionContext()->contentSecurityPolicy()->deprecatedHeader(), static_cast<WebContentSecurityPolicyType>(worker->executionContext()->contentSecurityPolicy()->deprecatedHeaderType()))); |
if (!webWorkerConnector) { |
// Existing worker does not match this url, so return an error back to the caller. |
exceptionState.throwDOMException(URLMismatchError, "The location of the SharedWorker named '" + name + "' does not exactly match the provided URL ('" + url.elidedString() + "')."); |