Move the contents of initializeWithoutV8/shutdownWithoutV8 to Platform::initialize/shutdown

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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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/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>
@@ skipping 20 matching lines @@
 public:
     DummyPlatform() { }
 };
 
 } // namespace
 
 int main(int argc, char** argv)
 {
     base::CommandLine::Init(argc, argv);
 
+    OwnPtr<DummyPlatform> platform = adoptPtr(new DummyPlatform);
+    blink::Platform::setCurrentPlatformForTesting(platform.get());
+
     WTF::Partitions::initialize(nullptr);
     WTF::setTimeFunctionsForTesting(dummyCurrentTime);
     WTF::initialize();
     WTF::initializeMainThread(0);
+    blink::CompositorFactory::initializeDefault();
     int result = 0;
     {
-        OwnPtr<DummyPlatform> platform = adoptPtr(new DummyPlatform);
-        blink::Platform::initialize(platform.get());
-        {
-            blink::TestingPlatformSupport::Config platformConfig;
-            cc_blink::WebCompositorSupportImpl compositorSupport;
-            platformConfig.compositorSupport = &compositorSupport;
-            blink::TestingPlatformSupport platform(platformConfig);
+        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::Heap::init();
+        blink::ThreadState::attachMainThread();
+        blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr);
+        blink::EventTracer::initialize();
+        blink::HTTPNames::init();
 
-            blink::HTTPNames::init();
+        base::TestSuite testSuite(argc, argv);
 
-            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)));
 
-            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::Platform::shutdown();
+        blink::ThreadState::detachMainThread();
+        blink::Heap::shutdown();
     }
-
+    blink::CompositorFactory::shutdown();
     WTF::shutdown();
     WTF::Partitions::shutdown();
     return result;
 }