| 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/logging.h" | 10 #include "base/logging.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "content/public/app/startup_helper_win.h" | 26 #include "content/public/app/startup_helper_win.h" |
| 27 #include "sandbox/win/src/sandbox_types.h" | 27 #include "sandbox/win/src/sandbox_types.h" |
| 28 #endif // defined(OS_WIN) | 28 #endif // defined(OS_WIN) |
| 29 | 29 |
| 30 #if defined(TOOLKIT_VIEWS) | 30 #if defined(TOOLKIT_VIEWS) |
| 31 #include "ui/views/focus/accelerator_handler.h" | 31 #include "ui/views/focus/accelerator_handler.h" |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 const char kEmptyTestName[] = "InProcessBrowserTest.Empty"; | 34 const char kEmptyTestName[] = "InProcessBrowserTest.Empty"; |
| 35 | 35 |
| 36 class ChromeTestLauncherDelegate : public test_launcher::TestLauncherDelegate { | 36 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { |
| 37 public: | 37 public: |
| 38 ChromeTestLauncherDelegate() {} | 38 ChromeTestLauncherDelegate() {} |
| 39 virtual ~ChromeTestLauncherDelegate() {} | 39 virtual ~ChromeTestLauncherDelegate() {} |
| 40 | 40 |
| 41 virtual std::string GetEmptyTestName() OVERRIDE { | 41 virtual std::string GetEmptyTestName() OVERRIDE { |
| 42 return kEmptyTestName; | 42 return kEmptyTestName; |
| 43 } | 43 } |
| 44 | 44 |
| 45 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { | 45 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { |
| 46 return ChromeTestSuite(argc, argv).Run(); | 46 return ChromeTestSuite(argc, argv).Run(); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 #endif | 106 #endif |
| 107 | 107 |
| 108 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate); | 108 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate); |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 int main(int argc, char** argv) { | 111 int main(int argc, char** argv) { |
| 112 #if defined(OS_MACOSX) | 112 #if defined(OS_MACOSX) |
| 113 chrome_browser_application_mac::RegisterBrowserCrApp(); | 113 chrome_browser_application_mac::RegisterBrowserCrApp(); |
| 114 #endif | 114 #endif |
| 115 ChromeTestLauncherDelegate launcher_delegate; | 115 ChromeTestLauncherDelegate launcher_delegate; |
| 116 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); | 116 return content::LaunchTests(&launcher_delegate, argc, argv); |
| 117 } | 117 } |
| OLD | NEW |