Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: third_party/WebKit/Source/platform/heap/RunAllTests.cpp

Issue 2321223003: Revert of Move collectGarbage* methods to ThreadState (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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* currentThreadState = blink::ThreadState::current(); 55 blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nu llptr, nullptr);
56 currentThreadState->registerTraceDOMWrappers(nullptr, nullptr, nullptr, null ptr);
57 int result = testSuite->Run(); 56 int result = testSuite->Run();
58 currentThreadState->collectAllGarbage(); 57 blink::ThreadHeap::collectAllGarbage();
59 return result; 58 return result;
60 } 59 }
61 60
62 int main(int argc, char** argv) 61 int main(int argc, char** argv)
63 { 62 {
64 base::TestSuite testSuite(argc, argv); 63 base::TestSuite testSuite(argc, argv);
65 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)));
66 } 65 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/PersistentTest.cpp ('k') | third_party/WebKit/Source/platform/heap/ThreadState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698