| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 } | 45 } |
| 46 ~BlinkTestEnvironmentScope() | 46 ~BlinkTestEnvironmentScope() |
| 47 { | 47 { |
| 48 content::TearDownBlinkTestEnvironment(); | 48 content::TearDownBlinkTestEnvironment(); |
| 49 } | 49 } |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 int runHelper(base::TestSuite* testSuite) | 52 int runHelper(base::TestSuite* testSuite) |
| 53 { | 53 { |
| 54 BlinkTestEnvironmentScope blinkTestEnvironment; | 54 BlinkTestEnvironmentScope blinkTestEnvironment; |
| 55 blink::ThreadState::current()->registerTraceDOMWrappers(0, 0); | 55 blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nu
llptr); |
| 56 int result = testSuite->Run(); | 56 int result = testSuite->Run(); |
| 57 blink::ThreadHeap::collectAllGarbage(); | 57 blink::ThreadHeap::collectAllGarbage(); |
| 58 return result; | 58 return result; |
| 59 } | 59 } |
| 60 | 60 |
| 61 int main(int argc, char** argv) | 61 int main(int argc, char** argv) |
| 62 { | 62 { |
| 63 base::TestSuite testSuite(argc, argv); | 63 base::TestSuite testSuite(argc, argv); |
| 64 return base::LaunchUnitTests(argc, argv, base::Bind(runHelper, base::Unretai
ned(&testSuite))); | 64 return base::LaunchUnitTests(argc, argv, base::Bind(runHelper, base::Unretai
ned(&testSuite))); |
| 65 } | 65 } |
| OLD | NEW |