| Index: chrome/common/extensions/docs/server2/server_instance.py
|
| diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py
|
| index 7dd7db07d4d2bb7e37e7dd68114d0bb7473d9e54..1ac82abdc830963443f2175c2da52466529a3c91 100644
|
| --- a/chrome/common/extensions/docs/server2/server_instance.py
|
| +++ b/chrome/common/extensions/docs/server2/server_instance.py
|
| @@ -14,8 +14,8 @@ from empty_dir_file_system import EmptyDirFileSystem
|
| from environment import IsDevServer
|
| from features_bundle import FeaturesBundle
|
| from github_file_system_provider import GithubFileSystemProvider
|
| -from host_file_system_provider import HostFileSystemProvider
|
| from host_file_system_iterator import HostFileSystemIterator
|
| +from host_file_system_provider import HostFileSystemProvider
|
| from object_store_creator import ObjectStoreCreator
|
| from path_canonicalizer import PathCanonicalizer
|
| from reference_resolver import ReferenceResolver
|
| @@ -24,6 +24,7 @@ from table_of_contents_renderer import TableOfContentsRenderer
|
| from template_renderer import TemplateRenderer
|
| from test_branch_utility import TestBranchUtility
|
| from test_object_store import TestObjectStore
|
| +from gcs_file_system_provider import CloudStorageFileSystemProvider
|
|
|
|
|
| class ServerInstance(object):
|
| @@ -34,6 +35,7 @@ class ServerInstance(object):
|
| branch_utility,
|
| host_file_system_provider,
|
| github_file_system_provider,
|
| + gcs_file_system_provider,
|
| base_path='/'):
|
| '''
|
| |object_store_creator|
|
| @@ -62,6 +64,7 @@ class ServerInstance(object):
|
| host_fs_at_trunk = host_file_system_provider.GetTrunk()
|
|
|
| self.github_file_system_provider = github_file_system_provider
|
| + self.gcs_file_system_provider = gcs_file_system_provider
|
|
|
| assert base_path.startswith('/') and base_path.endswith('/')
|
| self.base_path = base_path
|
| @@ -141,7 +144,8 @@ class ServerInstance(object):
|
| self.content_providers = ContentProviders(
|
| self.compiled_fs_factory,
|
| host_fs_at_trunk,
|
| - self.github_file_system_provider)
|
| + self.github_file_system_provider,
|
| + self.gcs_file_system_provider)
|
|
|
| # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry,
|
| # then factor out the DataSource creation into a factory method, so that
|
| @@ -174,6 +178,7 @@ class ServerInstance(object):
|
| TestBranchUtility.CreateWithCannedData(),
|
| file_system_provider,
|
| GithubFileSystemProvider.ForEmpty(),
|
| + CloudStorageFileSystemProvider(object_store_creator),
|
| base_path=base_path)
|
|
|
| @staticmethod
|
| @@ -187,4 +192,5 @@ class ServerInstance(object):
|
| CompiledFileSystem.Factory(object_store_creator),
|
| TestBranchUtility.CreateWithCannedData(),
|
| host_file_system_provider,
|
| - GithubFileSystemProvider.ForEmpty())
|
| + GithubFileSystemProvider.ForEmpty(),
|
| + CloudStorageFileSystemProvider(object_store_creator))
|
|
|