Merge WTF::initializeMainThread into WTF::initialize

third_party/WebKit/Source/platform/testing/RunAllTests.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/test/scoped_ipc_support.h"
 #include "platform/EventTracer.h"
 #include "platform/HTTPNames.h"
 #include "platform/graphics/CompositorFactory.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/MainThread.h"
 #include "wtf/Partitions.h"
 #include "wtf/WTF.h"
 #include <base/bind.h>
 #include <base/bind_helpers.h>
 #include <base/command_line.h>
 #include <base/test/launcher/unit_test_launcher.h>
 #include <base/test/test_suite.h>
 #include <cc/blink/web_compositor_support_impl.h>
 
 namespace {
@@ skipping 22 matching lines @@
     base::CommandLine::Init(argc, argv);
 
     base::TestDiscardableMemoryAllocator discardableMemoryAllocator;
     base::DiscardableMemoryAllocator::SetInstance(&discardableMemoryAllocator);
 
     OwnPtr<DummyPlatform> platform = adoptPtr(new DummyPlatform);
     blink::Platform::setCurrentPlatformForTesting(platform.get());
 
     WTF::Partitions::initialize(nullptr);
     WTF::setTimeFunctionsForTesting(dummyCurrentTime);
-    WTF::initialize();
-    WTF::initializeMainThread(0);
+    WTF::initialize(nullptr);
     blink::CompositorFactory::initializeDefault();
     int result = 0;
     {
         blink::TestingPlatformSupport::Config platformConfig;
         cc_blink::WebCompositorSupportImpl compositorSupport;
         platformConfig.compositorSupport = &compositorSupport;
         blink::TestingPlatformSupport platform(platformConfig);
 
         blink::Heap::init();
         blink::ThreadState::attachMainThread();
         blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr);
         blink::EventTracer::initialize();
         blink::HTTPNames::init();
 
         base::TestSuite testSuite(argc, argv);
 
         mojo::edk::Init();
         base::TestIOThread testIoThread(base::TestIOThread::kAutoStart);
         WTF::OwnPtr<mojo::edk::test::ScopedIPCSupport> ipcSupport(adoptPtr(new mojo::edk::test::ScopedIPCSupport(testIoThread.task_runner())));
         result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite)));
 
         blink::ThreadState::detachMainThread();
         blink::Heap::shutdown();
     }
     blink::CompositorFactory::shutdown();
     WTF::shutdown();
     WTF::Partitions::shutdown();
     return result;
 }