| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 14 matching lines...) Expand all Loading... |
| 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 #if BLINK_IMPLEMENTATION | 31 #if BLINK_IMPLEMENTATION |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 // TODO(thakis): Remove after https://codereview.chromium.org/224763005/ |
| 36 #undef FINAL |
| 37 |
| 35 // FIXME: Avoid this source dependency on Chromium's base module. | 38 // FIXME: Avoid this source dependency on Chromium's base module. |
| 36 #include <base/test/test_suite.h> | 39 #include <base/test/test_suite.h> |
| 37 | 40 |
| 38 #include "WebKit.h" | 41 #include "WebKit.h" |
| 39 #include "public/platform/Platform.h" | 42 #include "public/platform/Platform.h" |
| 40 #include <content/test/webkit_unit_test_support.h> | 43 #include <content/test/webkit_unit_test_support.h> |
| 41 | 44 |
| 42 #if defined(BLINK_DLL_UNITTEST) | 45 #if defined(BLINK_DLL_UNITTEST) |
| 43 #include "WebUnitTests.h" | 46 #include "WebUnitTests.h" |
| 44 #endif | 47 #endif |
| (...skipping 15 matching lines...) Expand all Loading... |
| 60 #else | 63 #else |
| 61 ::testing::InitGoogleMock(&argc, argv); | 64 ::testing::InitGoogleMock(&argc, argv); |
| 62 TestSuite testSuite(argc, argv); | 65 TestSuite testSuite(argc, argv); |
| 63 content::SetUpTestEnvironmentForWebKitUnitTests(); | 66 content::SetUpTestEnvironmentForWebKitUnitTests(); |
| 64 int result = testSuite.Run(); | 67 int result = testSuite.Run(); |
| 65 content::TearDownEnvironmentForWebKitUnitTests(); | 68 content::TearDownEnvironmentForWebKitUnitTests(); |
| 66 #endif | 69 #endif |
| 67 | 70 |
| 68 return result; | 71 return result; |
| 69 } | 72 } |
| OLD | NEW |