Docserver: Consolidate features caching and access.

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

Index: chrome/common/extensions/docs/server2/permissions_data_source.py
diff --git a/chrome/common/extensions/docs/server2/permissions_data_source.py b/chrome/common/extensions/docs/server2/permissions_data_source.py
index 7662fa77ab9d91a280d622ebe0f98585ea9259ba..599ad4b5ee9fe6d3ed0b94eda163f1d2a2308ba1 100644
--- a/chrome/common/extensions/docs/server2/permissions_data_source.py
+++ b/chrome/common/extensions/docs/server2/permissions_data_source.py
@@ -41,18 +41,9 @@ class PermissionsDataSource(object):
   '''Load and format permissions features to be used by templates. Requries a
   template data source be set before use.
   '''
-  def __init__(self,
-               compiled_fs_factory,
-               file_system,
-               api_features_path,
-               permissions_features_path,
-               permissions_json_path):
-    self._api_features_path = api_features_path
-    self._permissions_features_path = permissions_features_path
-    self._permissions_json_path = permissions_json_path
-    self._file_system = file_system
-    self._cache = compiled_fs_factory.Create(
-        self._CreatePermissionsDataSource, PermissionsDataSource)
+  def __init__(self, features_bundle):
+    self._features_bundle = features_bundle
+    self._cache = None
 
   def SetTemplateDataSource(self, template_data_source_factory):
     '''Initialize a template data source to be used to render partial templates
@@ -61,21 +52,13 @@ class PermissionsDataSource(object):
     self._template_data_source = template_data_source_factory.Create(
         None, {})
 
-  def _CreatePermissionsDataSource(self, _, content):
-    '''Combine the contents of |_permissions_json_path| and
-    |_permissions_features_path|. Filter into lists, one for extensions and
-    one for apps.
-    '''
-    api_features = Parse(self._file_system.ReadSingle(self._api_features_path))
+  def _CreateCache(self):
+    api_features = self._features_bundle.GetAPIFeatures()
+    permission_features = self._features_bundle.GetPermissionFeatures()
 
     def filter_for_platform(permissions, platform):
       return _ListifyPermissions(features.Filtered(permissions, platform))
 
-    permissions_json = Parse(self._file_system.ReadSingle(
-        self._permissions_json_path))
-    permission_features = features.MergedWith(
-        features.Parse(Parse(content)), permissions_json)
-
     _AddDependencyDescriptions(permission_features, api_features)
     # Turn partial templates into descriptions, ensure anchors are set.
     for permission in permission_features.values():
@@ -87,10 +70,12 @@ class PermissionsDataSource(object):
         del permission['partial']
 
     return {
-      'declare_apps': filter_for_platform(permission_features, 'app'),
+      'declare_apps': filter_for_platform(permission_features, 'apps'),
       'declare_extensions': filter_for_platform(
-          permission_features, 'extension')
+          permission_features, 'extensions')
     }
 
   def get(self, key):
-    return self._cache.GetFromFile(self._permissions_features_path)[key]
+    if self._cache is None:
+      self._cache = self._CreateCache()
+    return self._cache.get(key)

[not at google - send to devlin, 2013/10/01 16:34:34]

same comment as in manifest_data_source

[Ken Rockot(use gerrit already), 2013/10/01 22:18:16]

Done.