Refactor the devserver to make it easier to control caching

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

Index: chrome/common/extensions/docs/server2/api_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/api_data_source_test.py b/chrome/common/extensions/docs/server2/api_data_source_test.py
index 0178ceb0d2724898b32189843454a8a95514d7db..cabd7a2936eed6d9cb408bcf5002ec401b3e04d7 100755
--- a/chrome/common/extensions/docs/server2/api_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/api_data_source_test.py
@@ -57,15 +57,13 @@ class APIDataSourceTest(unittest.TestCase):
   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)