OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/test/base/chrome_test_launcher.h" | 5 #include "chrome/test/base/chrome_test_launcher.h" |
6 | 6 |
7 #include "chrome/test/base/chrome_test_suite.h" | 7 #include "chrome/test/base/chrome_test_suite.h" |
8 #include "ui/base/test/ui_controls.h" | 8 #include "ui/base/test/ui_controls.h" |
9 | 9 |
10 #if defined(USE_AURA) | 10 #if defined(USE_AURA) |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 #endif | 53 #endif |
54 #endif | 54 #endif |
55 } | 55 } |
56 | 56 |
57 virtual void Shutdown() OVERRIDE { | 57 virtual void Shutdown() OVERRIDE { |
58 #if defined(OS_WIN) | 58 #if defined(OS_WIN) |
59 com_initializer_.reset(); | 59 com_initializer_.reset(); |
60 #endif | 60 #endif |
61 } | 61 } |
62 | 62 |
63 virtual bool IsBrowserTestSuite() OVERRIDE { return false; } | |
64 | |
65 private: | 63 private: |
66 #if defined(OS_WIN) | 64 #if defined(OS_WIN) |
67 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | 65 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; |
68 #endif | 66 #endif |
69 }; | 67 }; |
70 | 68 |
71 class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner { | 69 class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner { |
72 public: | 70 public: |
73 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { | 71 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { |
74 return InteractiveUITestSuite(argc, argv).Run(); | 72 return InteractiveUITestSuite(argc, argv).Run(); |
75 } | 73 } |
76 }; | 74 }; |
77 | 75 |
78 int main(int argc, char** argv) { | 76 int main(int argc, char** argv) { |
79 // Run interactive_ui_tests serially, they do not support running in parallel. | 77 // Run interactive_ui_tests serially, they do not support running in parallel. |
80 int default_jobs = 1; | 78 int default_jobs = 1; |
81 InteractiveUITestSuiteRunner runner; | 79 InteractiveUITestSuiteRunner runner; |
82 return LaunchChromeTests(default_jobs, &runner, argc, argv); | 80 return LaunchChromeTests(default_jobs, &runner, argc, argv); |
83 } | 81 } |
OLD | NEW |