Refactor the devserver to make it easier to control caching

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

Index: chrome/common/extensions/docs/server2/sidenav_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/sidenav_data_source_test.py b/chrome/common/extensions/docs/server2/sidenav_data_source_test.py
index 7f136415ef371a3e3ea81981375ce53aeb482f99..b775e8d5382304d99f4d071f316d5297a327542c 100755
--- a/chrome/common/extensions/docs/server2/sidenav_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/sidenav_data_source_test.py
@@ -17,9 +17,8 @@ class SamplesDataSourceTest(unittest.TestCase):
     self._base_path = os.path.join(sys.path[0],
                                    'test_data',
                                    'sidenav_data_source')
-    self._cache_factory = CompiledFileSystem.Factory(
-        LocalFileSystem(self._base_path),
-        InMemoryObjectStore('fake_branch'))
+    self._compiled_fs_factory = CompiledFileSystem.Factory(
+        LocalFileSystem(self._base_path))
 
   def _CheckLevels(self, items, level=2):
     for item in items:
@@ -28,14 +27,14 @@ class SamplesDataSourceTest(unittest.TestCase):
         self._CheckLevels(item['items'], level=level + 1)
 
   def testLevels(self):
-    sidenav_data_source = SidenavDataSource.Factory(self._cache_factory,
+    sidenav_data_source = SidenavDataSource.Factory(self._compiled_fs_factory,
                                                     self._base_path).Create('')
     sidenav_json = sidenav_data_source.get('test')
     self._CheckLevels(sidenav_json)
 
   def testSelected(self):
     sidenav_data_source = SidenavDataSource.Factory(
-        self._cache_factory,
+        self._compiled_fs_factory,
         self._base_path).Create('www.b.com')
     sidenav_json = sidenav_data_source.get('test')
     # This will be prettier once JSON is loaded with an OrderedDict.