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 from api_categorizer import APICategorizer | 5 from api_categorizer import APICategorizer |
6 from api_data_source import APIDataSource | 6 from api_data_source import APIDataSource |
7 from api_list_data_source import APIListDataSource | 7 from api_list_data_source import APIListDataSource |
8 from api_models import APIModels | 8 from api_models import APIModels |
9 from availability_finder import AvailabilityFinder | 9 from availability_finder import AvailabilityFinder |
10 from compiled_file_system import CompiledFileSystem | 10 from compiled_file_system import CompiledFileSystem |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 extension_samples_fs, | 130 extension_samples_fs, |
131 app_samples_fs, | 131 app_samples_fs, |
132 CompiledFileSystem.Factory(object_store_creator), | 132 CompiledFileSystem.Factory(object_store_creator), |
133 self.ref_resolver_factory, | 133 self.ref_resolver_factory, |
134 base_path) | 134 base_path) |
135 | 135 |
136 self.api_data_source_factory.SetSamplesDataSourceFactory( | 136 self.api_data_source_factory.SetSamplesDataSourceFactory( |
137 self.samples_data_source_factory) | 137 self.samples_data_source_factory) |
138 | 138 |
139 self.content_providers = ContentProviders( | 139 self.content_providers = ContentProviders( |
| 140 object_store_creator, |
140 self.compiled_fs_factory, | 141 self.compiled_fs_factory, |
141 host_fs_at_trunk, | 142 host_fs_at_trunk, |
142 self.github_file_system_provider, | 143 self.github_file_system_provider, |
143 self.gcs_file_system_provider) | 144 self.gcs_file_system_provider) |
144 | 145 |
145 # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry, | 146 # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry, |
146 # then factor out the DataSource creation into a factory method, so that | 147 # then factor out the DataSource creation into a factory method, so that |
147 # the entire ServerInstance doesn't need to be passed in here. | 148 # the entire ServerInstance doesn't need to be passed in here. |
148 self.template_renderer = TemplateRenderer(self) | 149 self.template_renderer = TemplateRenderer(self) |
149 | 150 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 store_type=TestObjectStore) | 184 store_type=TestObjectStore) |
184 host_file_system_provider = HostFileSystemProvider.ForLocal( | 185 host_file_system_provider = HostFileSystemProvider.ForLocal( |
185 object_store_creator) | 186 object_store_creator) |
186 return ServerInstance( | 187 return ServerInstance( |
187 object_store_creator, | 188 object_store_creator, |
188 CompiledFileSystem.Factory(object_store_creator), | 189 CompiledFileSystem.Factory(object_store_creator), |
189 TestBranchUtility.CreateWithCannedData(), | 190 TestBranchUtility.CreateWithCannedData(), |
190 host_file_system_provider, | 191 host_file_system_provider, |
191 GithubFileSystemProvider.ForEmpty(), | 192 GithubFileSystemProvider.ForEmpty(), |
192 CloudStorageFileSystemProvider(object_store_creator)) | 193 CloudStorageFileSystemProvider(object_store_creator)) |
OLD | NEW |