| Index: third_party/WebKit/Source/web/tests/RunAllTests.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/RunAllTests.cpp b/third_party/WebKit/Source/web/tests/RunAllTests.cpp
|
| index ebd49150cedebe25c2ea6cc8d2d4db55bf7b7b9d..8b1298cfcfa25dad2280f898536320477778f9b2 100644
|
| --- a/third_party/WebKit/Source/web/tests/RunAllTests.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/RunAllTests.cpp
|
| @@ -36,6 +36,7 @@
|
| #include "bindings/core/v8/V8GCController.h"
|
| #include "content/test/blink_test_environment.h"
|
| #include "mojo/edk/embedder/embedder.h"
|
| +#include "platform/heap/ThreadState.h"
|
| #include "platform/weborigin/SchemeRegistry.h"
|
| #include <v8.h>
|
|
|
| @@ -53,8 +54,10 @@ int runHelper(base::TestSuite* testSuite)
|
| base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing));
|
| base::RunLoop().RunUntilIdle();
|
|
|
| - // Collect garbage in order to release mock objects referred from v8 or
|
| - // Oilpan heap. Otherwise false mock leaks will be reported.
|
| + // Collect garbage (including threadspecific persistent handles) in order
|
| + // to release mock objects referred from v8 or Oilpan heap. Otherwise false
|
| + // mock leaks will be reported.
|
| + blink::ThreadState::current()->callThreadShutdownHooks();
|
| blink::V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent());
|
|
|
| content::TearDownBlinkTestEnvironment();
|
|
|