Index: third_party/WebKit/Source/platform/testing/RunAllTests.cpp |
diff --git a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp |
index b84caf218bef1d8137776b47276d88a7285dcfb3..b624999aea778ef201be052ef502f398930f12b8 100644 |
--- a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp |
+++ b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp |
@@ -28,37 +28,20 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#include "base/memory/discardable_memory_allocator.h" |
-#include "base/test/test_discardable_memory_allocator.h" |
#include "base/test/test_io_thread.h" |
#include "mojo/edk/embedder/embedder.h" |
#include "mojo/edk/test/scoped_ipc_support.h" |
-#include "platform/EventTracer.h" |
-#include "platform/HTTPNames.h" |
#include "platform/heap/Heap.h" |
#include "platform/testing/TestingPlatformSupport.h" |
-#include "public/platform/Platform.h" |
-#include "wtf/CryptographicallyRandomNumber.h" |
-#include "wtf/CurrentTime.h" |
-#include "wtf/PtrUtil.h" |
-#include "wtf/WTF.h" |
-#include "wtf/allocator/Partitions.h" |
#include <base/bind.h> |
#include <base/bind_helpers.h> |
#include <base/command_line.h> |
-#include <base/metrics/statistics_recorder.h> |
#include <base/test/launcher/unit_test_launcher.h> |
#include <base/test/test_suite.h> |
-#include <cc/blink/web_compositor_support_impl.h> |
#include <memory> |
namespace { |
-double dummyCurrentTime() |
-{ |
- return 0.0; |
-} |
- |
int runTestSuite(base::TestSuite* testSuite) |
{ |
int result = testSuite->Run(); |
@@ -66,52 +49,21 @@ int runTestSuite(base::TestSuite* testSuite) |
return result; |
} |
-class DummyPlatform final : public blink::Platform { |
-public: |
- DummyPlatform() { } |
-}; |
- |
} // namespace |
int main(int argc, char** argv) |
{ |
base::CommandLine::Init(argc, argv); |
- base::TestDiscardableMemoryAllocator discardableMemoryAllocator; |
- base::DiscardableMemoryAllocator::SetInstance(&discardableMemoryAllocator); |
- |
- base::StatisticsRecorder::Initialize(); |
- |
- std::unique_ptr<DummyPlatform> platform = wrapUnique(new DummyPlatform); |
- blink::Platform::setCurrentPlatformForTesting(platform.get()); |
- |
- WTF::Partitions::initialize(nullptr); |
- WTF::setTimeFunctionsForTesting(dummyCurrentTime); |
- WTF::initialize(nullptr); |
+ blink::ScopedUnittestsEnvironmentSetup testEnvironmentSetup; |
int result = 0; |
{ |
- blink::TestingPlatformSupport::Config platformConfig; |
- cc_blink::WebCompositorSupportImpl compositorSupport; |
- platformConfig.compositorSupport = &compositorSupport; |
- blink::TestingPlatformSupport platform(platformConfig); |
- |
- blink::ProcessHeap::init(); |
- blink::ThreadState::attachMainThread(); |
- blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr); |
- blink::EventTracer::initialize(); |
- blink::HTTPNames::init(); |
- |
base::TestSuite testSuite(argc, argv); |
mojo::edk::Init(); |
base::TestIOThread testIoThread(base::TestIOThread::kAutoStart); |
std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipcSupport(wrapUnique(new mojo::edk::test::ScopedIPCSupport(testIoThread.task_runner()))); |
result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite))); |
- |
- blink::ThreadState::detachMainThread(); |
- blink::ProcessHeap::shutdown(); |
} |
- WTF::shutdown(); |
- WTF::Partitions::shutdown(); |
return result; |
} |