| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "base/memory/discardable_memory_allocator.h" |
| 32 #include "base/test/test_discardable_memory_allocator.h" |
| 31 #include "base/test/test_io_thread.h" | 33 #include "base/test/test_io_thread.h" |
| 32 #include "mojo/edk/embedder/embedder.h" | 34 #include "mojo/edk/embedder/embedder.h" |
| 33 #include "mojo/edk/test/scoped_ipc_support.h" | 35 #include "mojo/edk/test/scoped_ipc_support.h" |
| 34 #include "platform/EventTracer.h" | 36 #include "platform/EventTracer.h" |
| 35 #include "platform/HTTPNames.h" | 37 #include "platform/HTTPNames.h" |
| 36 #include "platform/graphics/CompositorFactory.h" | 38 #include "platform/graphics/CompositorFactory.h" |
| 37 #include "platform/heap/Heap.h" | 39 #include "platform/heap/Heap.h" |
| 38 #include "platform/testing/TestingPlatformSupport.h" | 40 #include "platform/testing/TestingPlatformSupport.h" |
| 39 #include "public/platform/Platform.h" | 41 #include "public/platform/Platform.h" |
| 40 #include "wtf/CryptographicallyRandomNumber.h" | 42 #include "wtf/CryptographicallyRandomNumber.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 67 public: | 69 public: |
| 68 DummyPlatform() { } | 70 DummyPlatform() { } |
| 69 }; | 71 }; |
| 70 | 72 |
| 71 } // namespace | 73 } // namespace |
| 72 | 74 |
| 73 int main(int argc, char** argv) | 75 int main(int argc, char** argv) |
| 74 { | 76 { |
| 75 base::CommandLine::Init(argc, argv); | 77 base::CommandLine::Init(argc, argv); |
| 76 | 78 |
| 79 base::TestDiscardableMemoryAllocator discardableMemoryAllocator; |
| 80 base::DiscardableMemoryAllocator::SetInstance(&discardableMemoryAllocator); |
| 81 |
| 77 OwnPtr<DummyPlatform> platform = adoptPtr(new DummyPlatform); | 82 OwnPtr<DummyPlatform> platform = adoptPtr(new DummyPlatform); |
| 78 blink::Platform::setCurrentPlatformForTesting(platform.get()); | 83 blink::Platform::setCurrentPlatformForTesting(platform.get()); |
| 79 | 84 |
| 80 WTF::Partitions::initialize(nullptr); | 85 WTF::Partitions::initialize(nullptr); |
| 81 WTF::setTimeFunctionsForTesting(dummyCurrentTime); | 86 WTF::setTimeFunctionsForTesting(dummyCurrentTime); |
| 82 WTF::initialize(); | 87 WTF::initialize(); |
| 83 WTF::initializeMainThread(0); | 88 WTF::initializeMainThread(0); |
| 84 blink::CompositorFactory::initializeDefault(); | 89 blink::CompositorFactory::initializeDefault(); |
| 85 int result = 0; | 90 int result = 0; |
| 86 { | 91 { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 103 result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base
::Unretained(&testSuite))); | 108 result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base
::Unretained(&testSuite))); |
| 104 | 109 |
| 105 blink::ThreadState::detachMainThread(); | 110 blink::ThreadState::detachMainThread(); |
| 106 blink::Heap::shutdown(); | 111 blink::Heap::shutdown(); |
| 107 } | 112 } |
| 108 blink::CompositorFactory::shutdown(); | 113 blink::CompositorFactory::shutdown(); |
| 109 WTF::shutdown(); | 114 WTF::shutdown(); |
| 110 WTF::Partitions::shutdown(); | 115 WTF::Partitions::shutdown(); |
| 111 return result; | 116 return result; |
| 112 } | 117 } |
| OLD | NEW |