Docserver: Consolidate features caching and access.

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

Index: chrome/common/extensions/docs/server2/permissions_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/permissions_data_source_test.py b/chrome/common/extensions/docs/server2/permissions_data_source_test.py
index f9b316f70d458f791c1b94084ba44966b268030b..41a6ad74ab235b61360ca6b1cbd8adcf9069cb0d 100755
--- a/chrome/common/extensions/docs/server2/permissions_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/permissions_data_source_test.py
@@ -7,6 +7,7 @@ import json
 import unittest
 
 from compiled_file_system import CompiledFileSystem
+from features_bundle import FeaturesBundle
 from object_store_creator import ObjectStoreCreator
 from permissions_data_source import PermissionsDataSource
 from test_file_system import TestFileSystem
@@ -23,7 +24,7 @@ file_system = TestFileSystem({
     'host-permissions': {
       'name': 'match pattern',
       'anchor': 'custom-anchor',
-      'platforms': ['app', 'extension'],
+      'platforms': ['apps', 'extensions'],
       'partial': 'host_permissions.html',
       'literal_name': True
     },
@@ -76,19 +77,19 @@ class PermissionsDataSourceTest(unittest.TestCase):
       {
         'name': 'activeTab',
         'anchor': 'activeTab',
-        'platforms': ['extension'],
+        'platforms': ['extensions'],
         'description': 'partial active_tab.html'
       },
       {
         'name': 'alarms',
         'anchor': 'alarms',
-        'platforms': ['app', 'extension'],
+        'platforms': ['apps', 'extensions'],
         'description': 'partial alarms.html'
       },
       {
         'name': 'background',
         'anchor': 'background',
-        'platforms': ['extension'],
+        'platforms': ['extensions'],
         'description': 'partial background.html'
       },
       {
@@ -96,7 +97,7 @@ class PermissionsDataSourceTest(unittest.TestCase):
         'anchor': 'custom-anchor',
         'literal_name': True,
         'description': 'partial host_permissions.html',
-        'platforms': ['app', 'extension']
+        'platforms': ['apps', 'extensions']
       }
     ]
 
@@ -104,36 +105,38 @@ class PermissionsDataSourceTest(unittest.TestCase):
       {
         'name': 'alarms',
         'anchor': 'alarms',
-        'platforms': ['app', 'extension'],
+        'platforms': ['apps', 'extensions'],
         'description': 'partial alarms.html'
       },
       {
         'name': 'audioCapture',
         'anchor': 'audioCapture',
         'description': 'partial audio_capture.html',
-        'platforms': ['app']
+        'platforms': ['apps']
       },
       {
         'anchor': 'cookies',
         'name': 'cookies',
         'description': 'partial permissions/generic_description',
-        'platforms': ['app']
+        'platforms': ['apps']
       },
       {
         'name': 'match pattern',
         'anchor': 'custom-anchor',
         'literal_name': True,
         'description': 'partial host_permissions.html',
-        'platforms': ['app', 'extension']
+        'platforms': ['apps', 'extensions']
       }
     ]
 
     permissions_data_source = PermissionsDataSource(
-        CompiledFileSystem.Factory(file_system, ObjectStoreCreator.ForTest()),
-        file_system,
-        '_api_features.json',
-        '_permission_features.json',
-        'permissions.json')
+        FeaturesBundle(
+          file_system,
+          CompiledFileSystem.Factory(file_system, ObjectStoreCreator.ForTest()),
+          {
+            'api': ('_api_features.json',),
+            'permission': ('_permission_features.json', 'permissions.json'),
+          }))
 
     permissions_data_source.SetTemplateDataSource(
         FakeTemplateDataSource.Factory())