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

Unified Diff: third_party/WebKit/Source/platform/testing/TestingPlatformSupport.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/platform/testing/TestingPlatformSupport.cpp
diff --git a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
index 7289ac6b02d7d8acc2125e8c044869a820b5d86a..42251b0e09c04f1f965b6847511014d35819d10c 100644
--- a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
+++ b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
@@ -71,7 +71,7 @@ class TestingPlatformSupport::TestingInterfaceProvider
mojo::ScopedMessagePipeHandle handle) override {
if (std::string(name) == mojom::blink::MimeRegistry::Name_) {
mojo::MakeStrongBinding(
- makeUnique<MockMimeRegistry>(),
+ WTF::makeUnique<MockMimeRegistry>(),
mojo::MakeRequest<mojom::blink::MimeRegistry>(std::move(handle)));
return;
}
@@ -318,22 +318,22 @@ ScopedUnittestsEnvironmentSetup::ScopedUnittestsEnvironmentSetup(int argc,
base::test::InitializeICUForTesting();
m_discardableMemoryAllocator =
- wrapUnique(new base::TestDiscardableMemoryAllocator);
+ WTF::wrapUnique(new base::TestDiscardableMemoryAllocator);
base::DiscardableMemoryAllocator::SetInstance(
m_discardableMemoryAllocator.get());
base::StatisticsRecorder::Initialize();
- m_platform = wrapUnique(new DummyPlatform);
+ m_platform = WTF::wrapUnique(new DummyPlatform);
Platform::setCurrentPlatformForTesting(m_platform.get());
WTF::Partitions::initialize(nullptr);
WTF::setTimeFunctionsForTesting(dummyCurrentTime);
WTF::initialize(nullptr);
- m_compositorSupport = wrapUnique(new cc_blink::WebCompositorSupportImpl);
+ m_compositorSupport = WTF::wrapUnique(new cc_blink::WebCompositorSupportImpl);
m_testingPlatformConfig.compositorSupport = m_compositorSupport.get();
m_testingPlatformSupport =
- makeUnique<TestingPlatformSupport>(m_testingPlatformConfig);
+ WTF::makeUnique<TestingPlatformSupport>(m_testingPlatformConfig);
ProcessHeap::init();
ThreadState::attachMainThread();

Powered by Google App Engine
This is Rietveld 408576698