Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" |
| 8 #include "ui/compositor/test/test_suite.h" | 8 #include "ui/compositor/test/test_suite.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| 11 | 11 |
| 12 class NoAtExitBaseTestSuite : public base::TestSuite { | 12 class NoAtExitBaseTestSuite : public base::TestSuite { |
| 13 public: | 13 public: |
| 14 NoAtExitBaseTestSuite(int argc, char** argv) | 14 NoAtExitBaseTestSuite(int argc, char** argv) |
| 15 : base::TestSuite(argc, argv, false) { | 15 : base::TestSuite(argc, argv, false) { |
| 16 } | 16 } |
| 17 }; | 17 }; |
| 18 | 18 |
| 19 #if !defined(USE_AURA) && defined(OS_ANDROID) | |
|
Nico
2013/11/10 05:07:09
Just "if !defined(USE_ARUA)", right? No, OS_ANDROI
hans
2013/11/11 19:29:51
Done. My brain was reading the #endif at line 37 a
| |
| 19 int RunTestSuite(int argc, char** argv) { | 20 int RunTestSuite(int argc, char** argv) { |
| 20 return NoAtExitBaseTestSuite(argc, argv).Run(); | 21 return NoAtExitBaseTestSuite(argc, argv).Run(); |
| 21 } | 22 } |
| 23 #endif | |
|
Nico
2013/11/10 05:07:09
// defined…
hans
2013/11/11 19:29:51
Done.
| |
| 22 | 24 |
| 23 } // namespace | 25 } // namespace |
| 24 | 26 |
| 25 int main(int argc, char** argv) { | 27 int main(int argc, char** argv) { |
| 26 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
| 27 ui::test::CompositorTestSuite test_suite(argc, argv); | 29 ui::test::CompositorTestSuite test_suite(argc, argv); |
| 28 | 30 |
| 29 return base::LaunchUnitTests( | 31 return base::LaunchUnitTests( |
| 30 argc, argv, base::Bind(&ui::test::CompositorTestSuite::Run, | 32 argc, argv, base::Bind(&ui::test::CompositorTestSuite::Run, |
| 31 base::Unretained(&test_suite))); | 33 base::Unretained(&test_suite))); |
| 32 #else | 34 #else |
| 33 #if !defined(OS_ANDROID) | 35 #if !defined(OS_ANDROID) |
| 34 base::AtExitManager at_exit; | 36 base::AtExitManager at_exit; |
| 35 #endif | 37 #endif |
| 36 return base::LaunchUnitTests(argc, | 38 return base::LaunchUnitTests(argc, |
| 37 argv, | 39 argv, |
| 38 base::Bind(&RunTestSuite, argc, argv)); | 40 base::Bind(&RunTestSuite, argc, argv)); |
| 39 #endif | 41 #endif |
| 40 } | 42 } |
| OLD | NEW |