| 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 17 matching lines...) Expand all Loading... |
| 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 #include "public/platform/Platform.h" | 35 #include "public/platform/Platform.h" |
| 36 #include "public/web/WebKit.h" | 36 #include "public/web/WebKit.h" |
| 37 #include "web/tests/WebUnitTests.h" | 37 #include "web/tests/WebUnitTests.h" |
| 38 #include <content/test/webkit_support.h> | 38 #include <content/test/blink_test_environment.h> |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 // Test helpers to support the fact that blink tests are gloriously complicated | 42 // Test helpers to support the fact that blink tests are gloriously complicated |
| 43 // in a shared library build. See WebUnitTests.h for more details. | 43 // in a shared library build. See WebUnitTests.h for more details. |
| 44 void preTestHook() | 44 void preTestHook() |
| 45 { | 45 { |
| 46 content::SetUpTestEnvironmentForUnitTests(); | 46 content::SetUpBlinkTestEnvironment(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 void postTestHook() | 49 void postTestHook() |
| 50 { | 50 { |
| 51 content::TearDownTestEnvironment(); | 51 content::TearDownBlinkTestEnvironment(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace | 54 } // namespace |
| 55 | 55 |
| 56 int main(int argc, char** argv) | 56 int main(int argc, char** argv) |
| 57 { | 57 { |
| 58 return blink::runWebTests(argc, argv, &preTestHook, &postTestHook); | 58 return blink::runWebTests(argc, argv, &preTestHook, &postTestHook); |
| 59 } | 59 } |
| OLD | NEW |