Docserver: Consolidate features caching and access.

chrome/common/extensions/docs/server2/server_instance.py

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 ef92a06c44d3b99500f7f6fb2167da8dfe471475..0d35a3d3b46490a528ccad248d580c38806e4d8d 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -9,12 +9,12 @@ from availability_finder import AvailabilityFinder
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
 from example_zipper import ExampleZipper
+from features_bundle import FeaturesBundle
 from host_file_system_creator import HostFileSystemCreator
 from host_file_system_iterator import HostFileSystemIterator
 from intro_data_source import IntroDataSource
 from object_store_creator import ObjectStoreCreator
 from path_canonicalizer import PathCanonicalizer
-from permissions_data_source import PermissionsDataSource
 from redirector import Redirector
 from reference_resolver import ReferenceResolver
 from samples_data_source import SamplesDataSource
@@ -23,7 +23,6 @@ from template_data_source import TemplateDataSource
 from test_branch_utility import TestBranchUtility
 from test_object_store import TestObjectStore
 
-
 class ServerInstance(object):
 
   def __init__(self,
@@ -49,16 +48,25 @@ class ServerInstance(object):
         host_file_system,
         branch_utility)
 
+    self.features_bundle = FeaturesBundle(
+        self.host_file_system,
+        self.compiled_host_fs_factory,
+        svn_constants.API_FEATURES_PATH,
+        svn_constants.MANIFEST_FEATURES_PATH,
+        svn_constants.MANIFEST_JSON_PATH,
+        svn_constants.PERMISSION_FEATURES_PATH,
+        svn_constants.PERMISSIONS_JSON_PATH)
+
     self.availability_finder = AvailabilityFinder(
         self.host_file_system_iterator,
         object_store_creator,
         branch_utility)
 
     self.api_list_data_source_factory = APIListDataSource.Factory(
-        self.compiled_host_fs_factory,
         self.host_file_system,
-        svn_constants.API_PATH,
-        svn_constants.PUBLIC_TEMPLATE_PATH)
+        self.compiled_host_fs_factory,
+        svn_constants.PUBLIC_TEMPLATE_PATH,
+        self.features_bundle)
 
     self.api_data_source_factory = APIDataSource.Factory(
         self.compiled_host_fs_factory,
@@ -98,13 +106,6 @@ class ServerInstance(object):
         self.ref_resolver_factory,
         [svn_constants.INTRO_PATH, svn_constants.ARTICLE_PATH])
 
-    self.permissions_data_source = PermissionsDataSource(
-        self.compiled_host_fs_factory,
-        self.host_file_system,
-        '/'.join((svn_constants.API_PATH, '_api_features.json')),
-        '/'.join((svn_constants.API_PATH, '_permission_features.json')),
-        '/'.join((svn_constants.JSON_PATH, 'permissions.json')))
-
     self.example_zipper = ExampleZipper(
         self.compiled_host_fs_factory,
         self.host_file_system,
@@ -117,12 +118,10 @@ class ServerInstance(object):
         self.host_file_system,
         svn_constants.PUBLIC_TEMPLATE_PATH)
 
-    self.strings_json_path = '/'.join((svn_constants.JSON_PATH, 'strings.json'))
+    self.strings_json_path = svn_constants.STRINGS_JSON_PATH
     self.sidenav_json_base_path = svn_constants.JSON_PATH
-    self.manifest_json_path = '/'.join(
-        (svn_constants.JSON_PATH, 'manifest.json'))
-    self.manifest_features_path = '/'.join(
-        (svn_constants.API_PATH, '_manifest_features.json'))
+    self.manifest_json_path = svn_constants.MANIFEST_JSON_PATH
+    self.manifest_features_path = svn_constants.MANIFEST_FEATURES_PATH
 
     self.template_data_source_factory = TemplateDataSource.Factory(
         self.api_data_source_factory,
@@ -131,14 +130,14 @@ class ServerInstance(object):
         self.samples_data_source_factory,
         self.compiled_host_fs_factory,
         self.ref_resolver_factory,
-        self.permissions_data_source,
+        self.features_bundle,
         svn_constants.PUBLIC_TEMPLATE_PATH,
         svn_constants.PRIVATE_TEMPLATE_PATH,
         base_path)
 
     self.api_data_source_factory.SetTemplateDataSource(
         self.template_data_source_factory)
-    self.permissions_data_source.SetTemplateDataSource(
+    self.features_bundle.AnnotateWithTemplateData(
         self.template_data_source_factory)
 
   @staticmethod