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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 extension_samples_fs, | 127 extension_samples_fs, |
128 app_samples_fs, | 128 app_samples_fs, |
129 CompiledFileSystem.Factory(object_store_creator), | 129 CompiledFileSystem.Factory(object_store_creator), |
130 self.ref_resolver_factory, | 130 self.ref_resolver_factory, |
131 base_path) | 131 base_path) |
132 | 132 |
133 self.api_data_source_factory.SetSamplesDataSourceFactory( | 133 self.api_data_source_factory.SetSamplesDataSourceFactory( |
134 self.samples_data_source_factory) | 134 self.samples_data_source_factory) |
135 | 135 |
136 self.content_providers = ContentProviders( | 136 self.content_providers = ContentProviders( |
| 137 object_store_creator, |
137 self.compiled_fs_factory, | 138 self.compiled_fs_factory, |
138 host_fs_at_trunk, | 139 host_fs_at_trunk, |
139 self.github_file_system_provider) | 140 self.github_file_system_provider) |
140 | 141 |
141 # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry, | 142 # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry, |
142 # then factor out the DataSource creation into a factory method, so that | 143 # then factor out the DataSource creation into a factory method, so that |
143 # the entire ServerInstance doesn't need to be passed in here. | 144 # the entire ServerInstance doesn't need to be passed in here. |
144 self.template_renderer = TemplateRenderer(self) | 145 self.template_renderer = TemplateRenderer(self) |
145 | 146 |
146 # TODO(kalman): It may be better for |document_renderer| to construct a | 147 # TODO(kalman): It may be better for |document_renderer| to construct a |
(...skipping 30 matching lines...) Expand all Loading... |
177 object_store_creator = ObjectStoreCreator(start_empty=False, | 178 object_store_creator = ObjectStoreCreator(start_empty=False, |
178 store_type=TestObjectStore) | 179 store_type=TestObjectStore) |
179 host_file_system_provider = HostFileSystemProvider.ForLocal( | 180 host_file_system_provider = HostFileSystemProvider.ForLocal( |
180 object_store_creator) | 181 object_store_creator) |
181 return ServerInstance( | 182 return ServerInstance( |
182 object_store_creator, | 183 object_store_creator, |
183 CompiledFileSystem.Factory(object_store_creator), | 184 CompiledFileSystem.Factory(object_store_creator), |
184 TestBranchUtility.CreateWithCannedData(), | 185 TestBranchUtility.CreateWithCannedData(), |
185 host_file_system_provider, | 186 host_file_system_provider, |
186 GithubFileSystemProvider.ForEmpty()) | 187 GithubFileSystemProvider.ForEmpty()) |
OLD | NEW |