Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/base_paths.h" | 5 #include "base/base_paths.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/test/launcher/unit_test_launcher.h" | 9 #include "base/test/launcher/unit_test_launcher.h" |
| 10 #include "base/test/test_io_thread.h" | |
| 10 #include "content/public/common/content_client.h" | 11 #include "content/public/common/content_client.h" |
| 11 #include "content/public/test/content_test_suite_base.h" | 12 #include "content/public/test/content_test_suite_base.h" |
| 12 #include "content/public/test/unittest_test_suite.h" | 13 #include "content/public/test/unittest_test_suite.h" |
| 13 #include "extensions/common/constants.h" | 14 #include "extensions/common/constants.h" |
| 14 #include "extensions/common/extension_paths.h" | 15 #include "extensions/common/extension_paths.h" |
| 15 #include "extensions/test/test_extensions_client.h" | 16 #include "extensions/test/test_extensions_client.h" |
| 16 #include "mojo/edk/embedder/embedder.h" | 17 #include "mojo/edk/embedder/embedder.h" |
| 18 #include "mojo/edk/test/scoped_ipc_support.h" | |
| 17 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
| 18 #include "ui/gl/test/gl_surface_test_support.h" | 20 #include "ui/gl/test/gl_surface_test_support.h" |
| 19 #include "url/url_util.h" | 21 #include "url/url_util.h" |
| 20 | 22 |
| 21 namespace { | 23 namespace { |
| 22 | 24 |
| 23 const int kNumExtensionStandardURLSchemes = 2; | 25 const int kNumExtensionStandardURLSchemes = 2; |
| 24 const url::SchemeWithType kExtensionStandardURLSchemes[ | 26 const url::SchemeWithType kExtensionStandardURLSchemes[ |
| 25 kNumExtensionStandardURLSchemes] = { | 27 kNumExtensionStandardURLSchemes] = { |
| 26 {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT}, | 28 {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT}, |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 ui::ResourceBundle::CleanupSharedInstance(); | 107 ui::ResourceBundle::CleanupSharedInstance(); |
| 106 content::ContentTestSuiteBase::Shutdown(); | 108 content::ContentTestSuiteBase::Shutdown(); |
| 107 } | 109 } |
| 108 | 110 |
| 109 } // namespace | 111 } // namespace |
| 110 | 112 |
| 111 int main(int argc, char** argv) { | 113 int main(int argc, char** argv) { |
| 112 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); | 114 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); |
| 113 | 115 |
| 114 mojo::edk::Init(); | 116 mojo::edk::Init(); |
| 117 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | |
|
Reilly Grant (use Gerrit)
2016/03/31 23:18:31
I'm a little nervous about adding this as there ma
| |
| 118 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); | |
| 119 | |
| 115 return base::LaunchUnitTests(argc, | 120 return base::LaunchUnitTests(argc, |
| 116 argv, | 121 argv, |
| 117 base::Bind(&content::UnitTestTestSuite::Run, | 122 base::Bind(&content::UnitTestTestSuite::Run, |
| 118 base::Unretained(&test_suite))); | 123 base::Unretained(&test_suite))); |
| 119 } | 124 } |
| OLD | NEW |