| 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 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "base/bind.h" | 31 #include "base/bind.h" |
| 32 #include "base/message_loop/message_loop.h" | 32 #include "base/message_loop/message_loop.h" |
| 33 #include "base/run_loop.h" | 33 #include "base/run_loop.h" |
| 34 #include "base/test/launcher/unit_test_launcher.h" | 34 #include "base/test/launcher/unit_test_launcher.h" |
| 35 #include "base/test/test_suite.h" | 35 #include "base/test/test_suite.h" |
| 36 #include "bindings/core/v8/V8GCController.h" | 36 #include "bindings/core/v8/V8GCController.h" |
| 37 #include "content/test/blink_test_environment.h" | 37 #include "content/test/blink_test_environment.h" |
| 38 #include "mojo/edk/embedder/embedder.h" | 38 #include "mojo/edk/embedder/embedder.h" |
| 39 #include "platform/heap/ThreadState.h" |
| 39 #include "platform/weborigin/SchemeRegistry.h" | 40 #include "platform/weborigin/SchemeRegistry.h" |
| 40 #include <v8.h> | 41 #include <v8.h> |
| 41 | 42 |
| 42 namespace { | 43 namespace { |
| 43 | 44 |
| 44 int runHelper(base::TestSuite* testSuite) | 45 int runHelper(base::TestSuite* testSuite) |
| 45 { | 46 { |
| 46 content::SetUpBlinkTestEnvironment(); | 47 content::SetUpBlinkTestEnvironment(); |
| 47 blink::SchemeRegistry::initialize(); | 48 blink::SchemeRegistry::initialize(); |
| 48 | 49 |
| 49 int result = testSuite->Run(); | 50 int result = testSuite->Run(); |
| 50 | 51 |
| 51 // Tickle EndOfTaskRunner which among other things will flush the queue | 52 // Tickle EndOfTaskRunner which among other things will flush the queue |
| 52 // of error messages via V8Initializer::reportRejectedPromisesOnMainThread. | 53 // of error messages via V8Initializer::reportRejectedPromisesOnMainThread. |
| 53 base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothin
g)); | 54 base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothin
g)); |
| 54 base::RunLoop().RunUntilIdle(); | 55 base::RunLoop().RunUntilIdle(); |
| 55 | 56 |
| 56 // Collect garbage in order to release mock objects referred from v8 or | 57 // Collect garbage (including threadspecific persistent handles) in order |
| 57 // Oilpan heap. Otherwise false mock leaks will be reported. | 58 // to release mock objects referred from v8 or Oilpan heap. Otherwise false |
| 59 // mock leaks will be reported. |
| 60 blink::ThreadState::current()->callThreadShutdownHooks(); |
| 58 blink::V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent()
); | 61 blink::V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent()
); |
| 59 | 62 |
| 60 content::TearDownBlinkTestEnvironment(); | 63 content::TearDownBlinkTestEnvironment(); |
| 61 | 64 |
| 62 return result; | 65 return result; |
| 63 } | 66 } |
| 64 | 67 |
| 65 } // namespace | 68 } // namespace |
| 66 | 69 |
| 67 int main(int argc, char** argv) | 70 int main(int argc, char** argv) |
| 68 { | 71 { |
| 69 mojo::edk::Init(); | 72 mojo::edk::Init(); |
| 70 | 73 |
| 71 base::TestSuite testSuite(argc, argv); | 74 base::TestSuite testSuite(argc, argv); |
| 72 return base::LaunchUnitTests(argc, argv, base::Bind(&runHelper, base::Unreta
ined(&testSuite))); | 75 return base::LaunchUnitTests(argc, argv, base::Bind(&runHelper, base::Unreta
ined(&testSuite))); |
| 73 } | 76 } |
| OLD | NEW |