| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
| 7 #include "chrome/test/base/chrome_unit_test_suite.h" | 7 #include "chrome/test/base/chrome_unit_test_suite.h" |
| 8 #include "content/public/test/unittest_test_suite.h" | 8 #include "content/public/test/unittest_test_suite.h" |
| 9 |
| 10 #if defined(USE_CHROME_EDK) |
| 11 #include "mojo/edk/embedder/test_embedder.h" |
| 12 #else |
| 9 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" | 13 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |
| 14 #endif |
| 10 | 15 |
| 11 int main(int argc, char **argv) { | 16 int main(int argc, char **argv) { |
| 12 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); | 17 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); |
| 13 | 18 |
| 14 mojo::embedder::test::InitWithSimplePlatformSupport(); | 19 mojo::embedder::test::InitWithSimplePlatformSupport(); |
| 15 return base::LaunchUnitTests( | 20 return base::LaunchUnitTests( |
| 16 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 21 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
| 17 base::Unretained(&test_suite))); | 22 base::Unretained(&test_suite))); |
| 18 } | 23 } |
| OLD | NEW |