| 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 "content/test/test_launcher.h" | 5 #include "content/test/test_launcher.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
| 10 #include "chrome/app/chrome_main_delegate.h" | 10 #include "chrome/app/chrome_main_delegate.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/chrome_constants.h" | 12 #include "chrome/common/chrome_constants.h" |
| 13 #include "chrome/test/base/chrome_test_suite.h" | 13 #include "chrome/test/base/chrome_test_suite.h" |
| 14 #include "content/app/content_main.h" | 14 #include "content/public/app/content_main.h" |
| 15 | 15 |
| 16 #if defined(OS_MACOSX) | 16 #if defined(OS_MACOSX) |
| 17 #include "chrome/browser/chrome_browser_application_mac.h" | 17 #include "chrome/browser/chrome_browser_application_mac.h" |
| 18 #endif // defined(OS_MACOSX) | 18 #endif // defined(OS_MACOSX) |
| 19 | 19 |
| 20 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
| 21 #include "content/public/app/startup_helper_win.h" | 21 #include "content/public/app/startup_helper_win.h" |
| 22 #include "sandbox/src/sandbox_types.h" | 22 #include "sandbox/src/sandbox_types.h" |
| 23 #endif // defined(OS_WIN) | 23 #endif // defined(OS_WIN) |
| 24 | 24 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 95 } |
| 96 | 96 |
| 97 private: | 97 private: |
| 98 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate); | 98 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate); |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 int main(int argc, char** argv) { | 101 int main(int argc, char** argv) { |
| 102 ChromeTestLauncherDelegate launcher_delegate; | 102 ChromeTestLauncherDelegate launcher_delegate; |
| 103 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); | 103 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); |
| 104 } | 104 } |
| OLD | NEW |