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 "content/public/common/content_client.h" | 10 #include "content/public/common/content_client.h" |
11 #include "content/public/test/content_test_suite_base.h" | 11 #include "content/public/test/content_test_suite_base.h" |
12 #include "content/public/test/unittest_test_suite.h" | 12 #include "content/public/test/unittest_test_suite.h" |
13 #include "extensions/common/constants.h" | 13 #include "extensions/common/constants.h" |
14 #include "extensions/common/extension_paths.h" | 14 #include "extensions/common/extension_paths.h" |
15 #include "extensions/test/test_extensions_client.h" | 15 #include "extensions/test/test_extensions_client.h" |
16 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" | 16 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/gl/test/gl_surface_test_support.h" | 18 #include "ui/gl/test/gl_surface_test_support.h" |
| 19 #include "url/url_util.h" |
19 | 20 |
20 namespace { | 21 namespace { |
21 | 22 |
22 // Content client that exists only to register chrome-extension:// scheme with | 23 // Content client that exists only to register chrome-extension:// scheme with |
23 // the url module. | 24 // the url module. |
24 // TODO(jamescook): Should this be merged with ShellContentClient? Should this | 25 // TODO(jamescook): Should this be merged with ShellContentClient? Should this |
25 // be a persistent object available to tests? | 26 // be a persistent object available to tests? |
26 class ExtensionsContentClient : public content::ContentClient { | 27 class ExtensionsContentClient : public content::ContentClient { |
27 public: | 28 public: |
28 ExtensionsContentClient() {} | 29 ExtensionsContentClient() {} |
29 ~ExtensionsContentClient() override {} | 30 ~ExtensionsContentClient() override {} |
30 | 31 |
31 // content::ContentClient overrides: | 32 // content::ContentClient overrides: |
32 void AddAdditionalSchemes( | 33 void AddAdditionalSchemes( |
33 std::vector<std::string>* standard_schemes, | 34 std::vector<url::SchemeWithType>* standard_schemes, |
34 std::vector<std::string>* savable_schemes) override { | 35 std::vector<std::string>* savable_schemes) override { |
35 standard_schemes->push_back(extensions::kExtensionScheme); | 36 standard_schemes->push_back( |
| 37 url::SchemeWithType(extensions::kExtensionScheme, |
| 38 url::SCHEME_WITHOUT_PORT)); |
36 savable_schemes->push_back(extensions::kExtensionScheme); | 39 savable_schemes->push_back(extensions::kExtensionScheme); |
37 standard_schemes->push_back(extensions::kExtensionResourceScheme); | 40 standard_schemes->push_back( |
| 41 url::SchemeWithType(extensions::kExtensionResourceScheme, |
| 42 url::SCHEME_WITHOUT_PORT)); |
38 savable_schemes->push_back(extensions::kExtensionResourceScheme); | 43 savable_schemes->push_back(extensions::kExtensionResourceScheme); |
39 } | 44 } |
40 | 45 |
41 private: | 46 private: |
42 DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient); | 47 DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient); |
43 }; | 48 }; |
44 | 49 |
45 // The test suite for extensions_unittests. | 50 // The test suite for extensions_unittests. |
46 class ExtensionsTestSuite : public content::ContentTestSuiteBase { | 51 class ExtensionsTestSuite : public content::ContentTestSuiteBase { |
47 public: | 52 public: |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 | 105 |
101 int main(int argc, char** argv) { | 106 int main(int argc, char** argv) { |
102 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); | 107 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); |
103 | 108 |
104 mojo::embedder::test::InitWithSimplePlatformSupport(); | 109 mojo::embedder::test::InitWithSimplePlatformSupport(); |
105 return base::LaunchUnitTests(argc, | 110 return base::LaunchUnitTests(argc, |
106 argv, | 111 argv, |
107 base::Bind(&content::UnitTestTestSuite::Run, | 112 base::Bind(&content::UnitTestTestSuite::Run, |
108 base::Unretained(&test_suite))); | 113 base::Unretained(&test_suite))); |
109 } | 114 } |
OLD | NEW |