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/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
8 #include "chrome/test/base/chrome_unit_test_suite.h" | 8 #include "chrome/test/base/chrome_unit_test_suite.h" |
9 #include "content/public/test/unittest_test_suite.h" | 9 #include "content/public/test/unittest_test_suite.h" |
10 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 10 #include "mojo/edk/embedder/embedder.h" |
11 | 11 |
12 int main(int argc, char **argv) { | 12 int main(int argc, char **argv) { |
13 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); | 13 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); |
14 | 14 |
15 // TODO(use_chrome_edk): This flag will go away and be default behavior soon, | 15 mojo::edk::Init(); |
16 // but we explicitly add it here for test coverage. | |
17 base::CommandLine::ForCurrentProcess()->AppendSwitch("use-new-edk"); | |
18 | |
19 mojo::embedder::Init(); | |
20 return base::LaunchUnitTests( | 16 return base::LaunchUnitTests( |
21 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 17 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
22 base::Unretained(&test_suite))); | 18 base::Unretained(&test_suite))); |
23 } | 19 } |
OLD | NEW |