| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 int main(int argc, char** argv) { | 51 int main(int argc, char** argv) { |
| 52 blink::ScopedUnittestsEnvironmentSetup testEnvironmentSetup(argc, argv); | 52 blink::ScopedUnittestsEnvironmentSetup testEnvironmentSetup(argc, argv); |
| 53 int result = 0; | 53 int result = 0; |
| 54 { | 54 { |
| 55 base::TestSuite testSuite(argc, argv); | 55 base::TestSuite testSuite(argc, argv); |
| 56 | 56 |
| 57 mojo::edk::Init(); | 57 mojo::edk::Init(); |
| 58 base::TestIOThread testIoThread(base::TestIOThread::kAutoStart); | 58 base::TestIOThread testIoThread(base::TestIOThread::kAutoStart); |
| 59 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipcSupport(wrapUnique( | 59 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipcSupport( |
| 60 new mojo::edk::test::ScopedIPCSupport(testIoThread.task_runner()))); | 60 WTF::wrapUnique( |
| 61 new mojo::edk::test::ScopedIPCSupport(testIoThread.task_runner()))); |
| 61 result = base::LaunchUnitTests( | 62 result = base::LaunchUnitTests( |
| 62 argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite))); | 63 argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite))); |
| 63 } | 64 } |
| 64 return result; | 65 return result; |
| 65 } | 66 } |
| OLD | NEW |