| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/test/test_launcher.h" | 5 #include "content/public/test/test_launcher.h" |
| 6 | 6 |
| 7 #include <stack> | 7 #include <stack> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/linked_ptr.h" | 13 #include "base/memory/linked_ptr.h" |
| 14 #include "base/process_util.h" | 14 #include "base/process_util.h" |
| 15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
| 16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 17 #include "base/test/test_file_util.h" | 17 #include "base/test/test_file_util.h" |
| 18 #include "chrome/app/chrome_main_delegate.h" | 18 #include "chrome/app/chrome_main_delegate.h" |
| 19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 #elif defined(USE_AURA) | 146 #elif defined(USE_AURA) |
| 147 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. | 147 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. |
| 148 ui_controls::InstallUIControlsAura(ui_controls::CreateUIControlsAura(NULL)); | 148 ui_controls::InstallUIControlsAura(ui_controls::CreateUIControlsAura(NULL)); |
| 149 #endif | 149 #endif |
| 150 | 150 |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 ChromeTestLauncherDelegate launcher_delegate; | 153 ChromeTestLauncherDelegate launcher_delegate; |
| 154 return content::LaunchTests(&launcher_delegate, argc, argv); | 154 return content::LaunchTests(&launcher_delegate, argc, argv); |
| 155 } | 155 } |
| OLD | NEW |