Docserver: Consolidate features caching and access.

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

Index: chrome/common/extensions/docs/server2/manifest_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/manifest_data_source_test.py b/chrome/common/extensions/docs/server2/manifest_data_source_test.py
index da0babccf324fb20b7fdd8be67d98205c256e1c1..1c02b8cbbcff699c7d5b87b7f80b9612e8ba0be2 100755
--- a/chrome/common/extensions/docs/server2/manifest_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/manifest_data_source_test.py
@@ -8,6 +8,7 @@ import json
 import unittest
 
 from compiled_file_system import CompiledFileSystem
+from features_bundle import FeaturesBundle
 import manifest_data_source
 from object_store_creator import ObjectStoreCreator
 from test_file_system import TestFileSystem
@@ -199,7 +200,7 @@ class ManifestDataSourceTest(unittest.TestCase):
     ]
 
     self.assertEqual(
-        expected_docs, manifest_data_source._ListifyAndSortDocs(docs, 'app'))
+        expected_docs, manifest_data_source._ListifyAndSortDocs(docs, 'apps'))
 
   def testManifestDataSource(self):
     file_system = TestFileSystem({
@@ -232,7 +233,7 @@ class ManifestDataSourceTest(unittest.TestCase):
         'has_example': True,
         'level': 'required',
         'name': 'doc1',
-        'platforms': ['app', 'extension'],
+        'platforms': ['apps', 'extensions'],
         'children': [
           {
             'annotations': [
@@ -241,7 +242,7 @@ class ManifestDataSourceTest(unittest.TestCase):
             ],
             'level': 'recommended',
             'name': 'sub1',
-            'platforms': ['app'],
+            'platforms': ['apps'],
             'is_last': True
           }
         ],
@@ -254,8 +255,10 @@ class ManifestDataSourceTest(unittest.TestCase):
         self.host_file_system = file_system
         self.compiled_host_fs_factory = CompiledFileSystem.Factory(
             file_system, ObjectStoreCreator.ForTest())
-        self.manifest_json_path = 'manifest.json'
-        self.manifest_features_path = '_manifest_features.json'
+        self.features_bundle = FeaturesBundle(
+            self.host_file_system,
+            self.compiled_host_fs_factory,
+            { 'manifest': ['_manifest_features.json', 'manifest.json'] })
 
     mds = manifest_data_source.ManifestDataSource(FakeServerInstance(), None)
     self.assertEqual(expected_app, mds.get('apps'))