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

Unified Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.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
Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
index da1fc20eae6ed67caa20a063892d7344eb2a368f..86215ef553cf10f86b96931cda4150819a73fc8b 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -80,8 +80,8 @@ namespace blink {
WebEmbeddedWorker* WebEmbeddedWorker::create(
WebServiceWorkerContextClient* client,
WebWorkerContentSettingsClientProxy* contentSettingsClient) {
- return new WebEmbeddedWorkerImpl(wrapUnique(client),
- wrapUnique(contentSettingsClient));
+ return new WebEmbeddedWorkerImpl(WTF::wrapUnique(client),
+ WTF::wrapUnique(contentSettingsClient));
}
static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances() {
@@ -339,7 +339,7 @@ void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) {
DCHECK(!m_askedToTerminate);
m_loadingShadowPage = false;
m_networkProvider =
- wrapUnique(m_workerContextClient->createServiceWorkerNetworkProvider(
+ WTF::wrapUnique(m_workerContextClient->createServiceWorkerNetworkProvider(
frame->dataSource()));
m_mainScriptLoader = WorkerScriptLoader::create();
m_mainScriptLoader->setRequestContext(
@@ -428,7 +428,7 @@ void WebEmbeddedWorkerImpl::startWorkerThread() {
ServiceWorkerGlobalScopeClientImpl::create(*m_workerContextClient));
provideServiceWorkerContainerClientToWorker(
workerClients,
- wrapUnique(m_workerContextClient->createServiceWorkerProvider()));
+ WTF::wrapUnique(m_workerContextClient->createServiceWorkerProvider()));
// We need to set the CSP to both the shadow page's document and the
// ServiceWorkerGlobalScope.
@@ -443,7 +443,7 @@ void WebEmbeddedWorkerImpl::startWorkerThread() {
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(
« no previous file with comments | « third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp ('k') | third_party/WebKit/Source/web/WebEmbeddedWorkerImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698