Refactor the devserver to make it easier to control caching

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

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import json
 import os
 import sys
 import unittest
 
@@ skipping 39 matching lines @@
   def setUp(self):
     self._base_path = os.path.join(sys.path[0], 'test_data', 'test_json')
 
   def _ReadLocalFile(self, filename):
     with open(os.path.join(self._base_path, filename), 'r') as f:
       return f.read()
 
   def _CreateRefResolver(self, filename):
     data_source = FakeAPIAndListDataSource(
         self._LoadJSON(filename))
-    return ReferenceResolver.Factory(data_source,
-                                     data_source,
-                                     InMemoryObjectStore('')).Create()
+    return ReferenceResolver.Factory(data_source, data_source).Create()
 
   def DISABLED_testSimple(self):
-    cache_factory = CompiledFileSystem.Factory(
+    compiled_fs_factory = CompiledFileSystem.Factory(
         LocalFileSystem(self._base_path),
         InMemoryObjectStore('fake_branch'))
-    data_source_factory = APIDataSource.Factory(cache_factory,
+    data_source_factory = APIDataSource.Factory(compiled_fs_factory,
                                                 '.')
     data_source_factory.SetSamplesDataSourceFactory(FakeSamplesDataSource())
     data_source = data_source_factory.Create({}, disable_refs=True)
 
     # Take the dict out of the list.
     expected = json.loads(self._ReadLocalFile('expected_test_file.json'))
     expected['permissions'] = None
     test1 = data_source.get('test_file')
     test1.pop('samples')
     self.assertEqual(expected, test1)
@@ skipping 51 matching lines @@
                       _MakeLink('ref_test.html#type-type2', 'type2')),
         _GetType(dict_, 'type3')['description'])
 
   def testRemoveNoDocs(self):
     d = self._LoadJSON('nodoc_test.json')
     _RemoveNoDocs(d)
     self.assertEqual(self._LoadJSON('expected_nodoc.json'), d)
 
 if __name__ == '__main__':
   unittest.main()