Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Unified Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebPepperSocket.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dee2b9c546dee4babfc0fadea9d4ee8fc6a19cc4..96ac11bc367e1d79dbd3c90620d1ebba46f5772d 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
@@ -170,7 +170,7 @@ void WebSharedWorkerImpl::willSendRequest(WebLocalFrame* frame,
void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) {
DCHECK(!m_loadingDocument);
DCHECK(!m_mainScriptLoader);
- m_networkProvider = wrapUnique(
+ m_networkProvider = WTF::wrapUnique(
m_client->createServiceWorkerNetworkProvider(frame->dataSource()));
m_mainScriptLoader = WorkerScriptLoader::create();
m_mainScriptLoader->setRequestContext(
@@ -322,7 +322,8 @@ void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) {
workerThread()->postTask(
BLINK_FROM_HERE,
createCrossThreadTask(
- &connectTask, passed(WebMessagePortChannelUniquePtr(webChannel))));
+ &connectTask,
+ WTF::passed(WebMessagePortChannelUniquePtr(webChannel))));
}
void WebSharedWorkerImpl::connectTask(WebMessagePortChannelUniquePtr channel,
@@ -380,7 +381,7 @@ void WebSharedWorkerImpl::onScriptLoaderFinished() {
WebSecurityOrigin webSecurityOrigin(m_loadingDocument->getSecurityOrigin());
provideContentSettingsClientToWorker(
workerClients,
- wrapUnique(
+ WTF::wrapUnique(
m_client->createWorkerContentSettingsClientProxy(webSecurityOrigin)));
provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create());
ContentSecurityPolicy* contentSecurityPolicy =
@@ -388,7 +389,7 @@ void WebSharedWorkerImpl::onScriptLoaderFinished() {
WorkerThreadStartMode startMode =
m_workerInspectorProxy->workerStartMode(document);
std::unique_ptr<WorkerSettings> workerSettings =
- wrapUnique(new WorkerSettings(document->settings()));
+ WTF::wrapUnique(new WorkerSettings(document->settings()));
std::unique_ptr<WorkerThreadStartupData> startupData =
WorkerThreadStartupData::create(
m_url, m_loadingDocument->userAgent(), m_mainScriptLoader->script(),
« no previous file with comments | « third_party/WebKit/Source/web/WebPepperSocket.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698