Chromium Code Reviews| 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 17 matching lines...) Expand all Loading... | |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "base/bind.h" | 31 #include "base/bind.h" |
| 32 #include "base/run_loop.h" | 32 #include "base/run_loop.h" |
| 33 #include "base/test/launcher/unit_test_launcher.h" | 33 #include "base/test/launcher/unit_test_launcher.h" |
| 34 #include "base/test/test_suite.h" | 34 #include "base/test/test_suite.h" |
| 35 #include "base/threading/thread_task_runner_handle.h" | 35 #include "base/threading/thread_task_runner_handle.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" | |
| 39 #include "platform/heap/ThreadState.h" | 38 #include "platform/heap/ThreadState.h" |
| 40 #include "platform/weborigin/SchemeRegistry.h" | 39 #include "platform/weborigin/SchemeRegistry.h" |
| 41 #include <v8.h> | 40 #include <v8.h> |
| 42 | 41 |
| 43 namespace { | 42 namespace { |
| 44 | 43 |
| 45 int runHelper(base::TestSuite* testSuite) { | 44 int runHelper(base::TestSuite* testSuite) { |
| 46 content::SetUpBlinkTestEnvironment(); | 45 content::SetUpBlinkTestEnvironment(); |
| 47 blink::SchemeRegistry::initialize(); | 46 blink::SchemeRegistry::initialize(); |
| 48 | 47 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 60 blink::V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent()); | 59 blink::V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent()); |
| 61 | 60 |
| 62 content::TearDownBlinkTestEnvironment(); | 61 content::TearDownBlinkTestEnvironment(); |
| 63 | 62 |
| 64 return result; | 63 return result; |
| 65 } | 64 } |
| 66 | 65 |
| 67 } // namespace | 66 } // namespace |
| 68 | 67 |
| 69 int main(int argc, char** argv) { | 68 int main(int argc, char** argv) { |
| 70 mojo::edk::Init(); | |
|
leonhsl(Using Gerrit)
2016/10/18 10:03:52
No need to init mojo edk any more, content::SetUpB
| |
| 71 | |
| 72 base::TestSuite testSuite(argc, argv); | 69 base::TestSuite testSuite(argc, argv); |
| 73 return base::LaunchUnitTests( | 70 return base::LaunchUnitTests( |
| 74 argc, argv, base::Bind(&runHelper, base::Unretained(&testSuite))); | 71 argc, argv, base::Bind(&runHelper, base::Unretained(&testSuite))); |
| 75 } | 72 } |
| OLD | NEW |