OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 } | 50 } |
51 ~BlinkTestEnvironmentScope() | 51 ~BlinkTestEnvironmentScope() |
52 { | 52 { |
53 content::TearDownBlinkTestEnvironment(); | 53 content::TearDownBlinkTestEnvironment(); |
54 } | 54 } |
55 }; | 55 }; |
56 | 56 |
57 int runHelper(TestSuite* testSuite) | 57 int runHelper(TestSuite* testSuite) |
58 { | 58 { |
59 BlinkTestEnvironmentScope blinkTestEnvironment; | 59 BlinkTestEnvironmentScope blinkTestEnvironment; |
| 60 blink::ThreadState::current()->registerTraceDOMWrappers(0, 0); |
60 int result = testSuite->Run(); | 61 int result = testSuite->Run(); |
61 blink::Heap::collectAllGarbage(); | 62 blink::Heap::collectAllGarbage(); |
62 return result; | 63 return result; |
63 } | 64 } |
64 | 65 |
65 int main(int argc, char** argv) | 66 int main(int argc, char** argv) |
66 { | 67 { |
67 TestSuite testSuite(argc, argv); | 68 TestSuite testSuite(argc, argv); |
68 return base::LaunchUnitTests(argc, argv, base::Bind(runHelper, base::Unretai
ned(&testSuite))); | 69 return base::LaunchUnitTests(argc, argv, base::Bind(runHelper, base::Unretai
ned(&testSuite))); |
69 } | 70 } |
OLD | NEW |