| 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 "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 } | 54 } |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 scoped_ptr<ShellContentClient> content_client_; | 57 scoped_ptr<ShellContentClient> content_client_; |
| 58 scoped_ptr<ShellContentBrowserClient> browser_content_client_; | 58 scoped_ptr<ShellContentBrowserClient> browser_content_client_; |
| 59 | 59 |
| 60 DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer); | 60 DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer); |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 #if defined(OS_ANDROID) | 63 #if defined(OS_ANDROID) |
| 64 base::MessagePump* CreateMessagePumpForUI() { | 64 scoped_ptr<base::MessagePump> CreateMessagePumpForUI() { |
| 65 return new NestedMessagePumpAndroid(); | 65 return scoped_ptr<base::MessagePump>(new NestedMessagePumpAndroid()); |
| 66 }; | 66 }; |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 class ContentBrowserTestSuite : public ContentTestSuiteBase { | 69 class ContentBrowserTestSuite : public ContentTestSuiteBase { |
| 70 public: | 70 public: |
| 71 ContentBrowserTestSuite(int argc, char** argv) | 71 ContentBrowserTestSuite(int argc, char** argv) |
| 72 : ContentTestSuiteBase(argc, argv) { | 72 : ContentTestSuiteBase(argc, argv) { |
| 73 } | 73 } |
| 74 virtual ~ContentBrowserTestSuite() { | 74 virtual ~ContentBrowserTestSuite() { |
| 75 } | 75 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); | 129 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 } // namespace content | 132 } // namespace content |
| 133 | 133 |
| 134 int main(int argc, char** argv) { | 134 int main(int argc, char** argv) { |
| 135 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); | 135 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); |
| 136 content::ContentTestLauncherDelegate launcher_delegate; | 136 content::ContentTestLauncherDelegate launcher_delegate; |
| 137 return LaunchTests(&launcher_delegate, default_jobs, argc, argv); | 137 return LaunchTests(&launcher_delegate, default_jobs, argc, argv); |
| 138 } | 138 } |
| OLD | NEW |