Docserver: Consolidate features caching and access.

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

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from copy import deepcopy
 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
 
 
 convert_and_annotate_docs = {
   'name': {
     'example': "My {{title}}",
     'name': 'name',
     'level': 'required'
@@ skipping 171 matching lines @@
                   }
                 ]
               }
             ]
           }
         ]
       }
     ]
 
     self.assertEqual(
-        expected_docs, manifest_data_source._ListifyAndSortDocs(docs, 'app'))
+        expected_docs, manifest_data_source._ListifyAndSortDocs(docs, 'apps'))
 
   def testManifestDataSource(self):
     file_system = TestFileSystem({
       '_manifest_features.json': json.dumps({
         'doc1': {
           'extension_types': 'all'
         },
         'doc1.sub1': {
           'extension_types': ['platform_app']
         },
@@ skipping 12 matching lines @@
         }
       })
     })
 
     expected_app = [
       {
         'example': '{...}',
         'has_example': True,
         'level': 'required',
         'name': 'doc1',
-        'platforms': ['app', 'extension'],
+        'platforms': ['apps', 'extensions'],
         'children': [
           {
             'annotations': [
               'Recommended',
               'important!'
             ],
             'level': 'recommended',
             'name': 'sub1',
-            'platforms': ['app'],
+            'platforms': ['apps'],
             'is_last': True
           }
         ],
         'is_last': True
       }
     ]
 
     class FakeServerInstance(object):
       def __init__(self):
         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'))
 
 if __name__ == '__main__':
   unittest.main()