| 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_util.h" | 10 #include "base/file_util.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 #if defined(USE_AURA) | 41 #if defined(USE_AURA) |
| 42 #include "ui/aura/test/ui_controls_factory_aura.h" | 42 #include "ui/aura/test/ui_controls_factory_aura.h" |
| 43 #include "ui/base/test/ui_controls_aura.h" | 43 #include "ui/base/test/ui_controls_aura.h" |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
| 47 #include "ash/test/ui_controls_factory_ash.h" | 47 #include "ash/test/ui_controls_factory_ash.h" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 const char kEmptyTestName[] = "InProcessBrowserTest.Empty"; | |
| 51 | |
| 52 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { | 50 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { |
| 53 public: | 51 public: |
| 54 ChromeTestLauncherDelegate() {} | 52 ChromeTestLauncherDelegate() {} |
| 55 virtual ~ChromeTestLauncherDelegate() {} | 53 virtual ~ChromeTestLauncherDelegate() {} |
| 56 | 54 |
| 57 virtual std::string GetEmptyTestName() OVERRIDE { | |
| 58 return kEmptyTestName; | |
| 59 } | |
| 60 | |
| 61 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { | 55 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { |
| 62 return ChromeTestSuite(argc, argv).Run(); | 56 return ChromeTestSuite(argc, argv).Run(); |
| 63 } | 57 } |
| 64 | 58 |
| 65 virtual bool AdjustChildProcessCommandLine( | 59 virtual bool AdjustChildProcessCommandLine( |
| 66 CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE { | 60 CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE { |
| 67 CommandLine new_command_line(command_line->GetProgram()); | 61 CommandLine new_command_line(command_line->GetProgram()); |
| 68 CommandLine::SwitchMap switches = command_line->GetSwitches(); | 62 CommandLine::SwitchMap switches = command_line->GetSwitches(); |
| 69 | 63 |
| 70 // Strip out user-data-dir if present. We will add it back in again later. | 64 // Strip out user-data-dir if present. We will add it back in again later. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 #elif defined(USE_AURA) | 147 #elif defined(USE_AURA) |
| 154 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. | 148 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. |
| 155 ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL)); | 149 ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL)); |
| 156 #endif | 150 #endif |
| 157 | 151 |
| 158 #endif | 152 #endif |
| 159 | 153 |
| 160 ChromeTestLauncherDelegate launcher_delegate; | 154 ChromeTestLauncherDelegate launcher_delegate; |
| 161 return content::LaunchTests(&launcher_delegate, argc, argv); | 155 return content::LaunchTests(&launcher_delegate, argc, argv); |
| 162 } | 156 } |
| OLD | NEW |