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..7d0c0b7f92066a43301a4ad37542317060161134 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -55,10 +55,11 @@ class ServerInstance(object):
         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)
+        host_file_system,
+        svn_constants.PUBLIC_TEMPLATE_PATH,
+        svn_constants.API_FEATURES_PATH,
+        svn_constants.MANIFEST_FEATURES_PATH,
+        svn_constants.PERMISSION_FEATURES_PATH)
 
     self.api_data_source_factory = APIDataSource.Factory(
         self.compiled_host_fs_factory,
@@ -101,9 +102,9 @@ class ServerInstance(object):
     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')))
+        svn_constants.API_FEATURES_PATH,
+        svn_constants.PERMISSION_FEATURES_PATH,
+        svn_constants.PERMISSIONS_JSON_PATH)
 
     self.example_zipper = ExampleZipper(
         self.compiled_host_fs_factory,
@@ -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

[not at google - send to devlin, 2013/09/19 19:21:52]

thanks for the cleanup

 
     self.template_data_source_factory = TemplateDataSource.Factory(
         self.api_data_source_factory,