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 0bf7eb1313aa7c3e22714e9ca3372845c81189a3..db83a09219c63c3879cb75428d34650ede6f751b 100644 |
--- a/chrome/common/extensions/docs/server2/server_instance.py |
+++ b/chrome/common/extensions/docs/server2/server_instance.py |
@@ -4,13 +4,14 @@ |
from fnmatch import fnmatch |
import mimetypes |
-import os |
from api_data_source import APIDataSource |
from api_list_data_source import APIListDataSource |
from appengine_blobstore import AppEngineBlobstore |
from appengine_url_fetcher import AppEngineUrlFetcher |
+from availability_data_source import AvailabilityDataSource |
from branch_utility import BranchUtility |
+from chrome_version_utility import ChromeVersionUtility |
from compiled_file_system import CompiledFileSystem |
from example_zipper import ExampleZipper |
from file_system import FileNotFoundError |
@@ -48,8 +49,9 @@ class ServerInstance(object): |
if ServerInstance.branch_utility is None: |
ServerInstance.branch_utility = BranchUtility( |
url_constants.OMAHA_PROXY_URL, AppEngineUrlFetcher()) |
- branch = ServerInstance.branch_utility.GetBranchNumberForChannelName( |
- channel) |
+ |
+ branch = ServerInstance.branch_utility.GetChannelInfoForChannelName( |
+ channel)['branch'] |
# Use the branch as the key to |_instances| since the branch data is |
# predictable while the channel data (channels can swich branches) isn't. |
@@ -113,6 +115,14 @@ class ServerInstance(object): |
svn_file_system, |
object_store_creator_factory) |
+ self.chrome_version_utility = ChromeVersionUtility( |
+ url_constants.OMAHA_DEV_HISTORY, |
+ AppEngineUrlFetcher(None)) |
+ |
+ self.availability_data_source_factory = AvailabilityDataSource.Factory( |
+ self.chrome_version_utility, |
+ svn_file_system) |
+ |
self.api_list_data_source_factory = APIListDataSource.Factory( |
self.compiled_fs_factory, |
svn_constants.API_PATH, |
@@ -120,7 +130,8 @@ class ServerInstance(object): |
self.api_data_source_factory = APIDataSource.Factory( |
self.compiled_fs_factory, |
- svn_constants.API_PATH) |
+ svn_constants.API_PATH, |
+ self.availability_data_source_factory) |
self.ref_resolver_factory = ReferenceResolver.Factory( |
self.api_data_source_factory, |