Docserver: Consolidate features caching and access.

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

Index: chrome/common/extensions/docs/server2/template_data_source.py
diff --git a/chrome/common/extensions/docs/server2/template_data_source.py b/chrome/common/extensions/docs/server2/template_data_source.py
index 7c7a11b4206da31d1f9b4fdeb8b0073fb03d390e..ce5802191ad403bdbc803f0de7254c5eeeddbb0e 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -34,7 +34,7 @@ class TemplateDataSource(object):
                  samples_data_source_factory,
                  compiled_fs_factory,
                  ref_resolver_factory,
-                 permissions_data_source,
+                 features_bundle,
                  public_template_path,
                  private_template_path,
                  base_path):
@@ -45,7 +45,7 @@ class TemplateDataSource(object):
       self._cache = compiled_fs_factory.Create(self._CreateTemplate,
                                                TemplateDataSource)
       self._ref_resolver = ref_resolver_factory.Create()
-      self._permissions_data_source = permissions_data_source
+      self._features_bundle = features_bundle
       self._public_template_path = public_template_path
       self._private_template_path = private_template_path
       self._base_path = base_path
@@ -66,7 +66,7 @@ class TemplateDataSource(object):
           self._intro_data_source_factory.Create(),
           self._samples_data_source_factory.Create(request),
           self._cache,
-          self._permissions_data_source,
+          self._features_bundle,
           self._public_template_path,
           self._private_template_path,
           self._base_path,
@@ -78,7 +78,7 @@ class TemplateDataSource(object):
                intro_data_source,
                samples_data_source,
                cache,
-               permissions_data_source,
+               features_bundle,
                public_template_path,
                private_template_path,
                base_path,
@@ -90,7 +90,7 @@ class TemplateDataSource(object):
     self._cache = cache
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path
-    self._permissions_data_source = permissions_data_source
+    self._features_bundle = features_bundle
     self._base_path = base_path
     self._data_sources = data_sources
 
@@ -108,7 +108,7 @@ class TemplateDataSource(object):
       'apis': self._api_data_source,
       'intros': self._intro_data_source,
       'partials': self,
-      'permissions': self._permissions_data_source,
+      'permissions': self._features_bundle.get('permission'),
       'samples': self._samples_data_source,
       'apps_samples_url': url_constants.GITHUB_BASE,
       'extensions_samples_url': url_constants.EXTENSIONS_SAMPLES,