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 4641a0d32e008a1e8716a858293869424e918187..b1cb08ffb2cd31b1d4c6a14983b29634708254fc 100644 |
--- a/chrome/common/extensions/docs/server2/server_instance.py |
+++ b/chrome/common/extensions/docs/server2/server_instance.py |
@@ -3,7 +3,6 @@ |
# found in the LICENSE file. |
from fnmatch import fnmatch |
-import logging |
import mimetypes |
import traceback |
import os |
@@ -12,8 +11,10 @@ from api_data_source import APIDataSource |
from api_list_data_source import APIListDataSource |
from appengine_url_fetcher import AppEngineUrlFetcher |
from appengine_wrappers import GetAppVersion, IsDevServer |
+from availability_finder import AvailabilityFinder |
from branch_utility import BranchUtility |
from caching_file_system import CachingFileSystem |
+from chrome_version_utility import ChromeVersionUtility |
from compiled_file_system import CompiledFileSystem |
from empty_dir_file_system import EmptyDirFileSystem |
from example_zipper import ExampleZipper |
@@ -27,9 +28,9 @@ from path_canonicalizer import PathCanonicalizer |
from reference_resolver import ReferenceResolver |
from samples_data_source import SamplesDataSource |
from sidenav_data_source import SidenavDataSource |
-from subversion_file_system import SubversionFileSystem |
import svn_constants |
from template_data_source import TemplateDataSource |
+from test_file_system import TestFileSystem |
from test_object_store import TestObjectStore |
from third_party.json_schema_compiler.model import UnixName |
import url_constants |
@@ -41,7 +42,8 @@ class ServerInstance(object): |
host_file_system, |
app_samples_file_system, |
static_path, |
- compiled_fs_factory): |
+ compiled_fs_factory, |
+ create_file_system): |
self.channel = channel |
self.object_store_creator = object_store_creator |
@@ -52,6 +54,17 @@ class ServerInstance(object): |
self.compiled_host_fs_factory = compiled_fs_factory |
+ self.chrome_version_utility = ChromeVersionUtility( |
+ url_constants.OMAHA_DEV_HISTORY, |
+ AppEngineUrlFetcher(), |
+ object_store_creator) |
+ |
+ self.availability_finder_factory = AvailabilityFinder.Factory( |
+ self.chrome_version_utility, |
+ object_store_creator, |
+ self.compiled_host_fs_factory, |
+ create_file_system) |
+ |
self.api_list_data_source_factory = APIListDataSource.Factory( |
self.compiled_host_fs_factory, |
svn_constants.API_PATH, |
@@ -59,7 +72,8 @@ class ServerInstance(object): |
self.api_data_source_factory = APIDataSource.Factory( |
self.compiled_host_fs_factory, |
- svn_constants.API_PATH) |
+ svn_constants.API_PATH, |
+ self.availability_finder_factory) |
self.ref_resolver_factory = ReferenceResolver.Factory( |
self.api_data_source_factory, |
@@ -130,7 +144,8 @@ class ServerInstance(object): |
EmptyDirFileSystem(), |
'/static', |
CompiledFileSystem.Factory(file_system, |
- object_store_creator)) |
+ object_store_creator), |
+ lambda branch: file_system) |
@staticmethod |
def ForLocal(): |
@@ -138,12 +153,14 @@ class ServerInstance(object): |
object_store_creator = ObjectStoreCreator(channel, |
start_empty=False, |
store_type=TestObjectStore) |
- file_system = CachingFileSystem(LocalFileSystem.Create(), |
- object_store_creator) |
+ def create_file_system(branch): |
+ return CachingFileSystem(LocalFileSystem.Create(), object_store_creator) |
+ file_system = create_file_system('trunk'); |
return ServerInstance( |
channel, |
object_store_creator, |
file_system, |
EmptyDirFileSystem(), |
'/static', |
- CompiledFileSystem.Factory(file_system, object_store_creator)) |
+ CompiledFileSystem.Factory(file_system, object_store_creator), |
+ create_file_system) |