Refactor the devserver to make it easier to control caching

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

Index: chrome/common/extensions/docs/server2/reference_resolver.py
diff --git a/chrome/common/extensions/docs/server2/reference_resolver.py b/chrome/common/extensions/docs/server2/reference_resolver.py
index 4d1022752735fc021807db3a9f838c525d0792a7..235daeda50ae9f59b258e7c42c20e24dfe95e2ae 100644
--- a/chrome/common/extensions/docs/server2/reference_resolver.py
+++ b/chrome/common/extensions/docs/server2/reference_resolver.py
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 from file_system import FileNotFoundError
+from object_store_creator import ObjectStoreCreator
 import logging
-import object_store
 import re
 import string
 
@@ -50,19 +50,15 @@ class ReferenceResolver(object):
   _bare_ref = re.compile('\w+(\.\w+)*')
 
   class Factory(object):
-    def __init__(self,
-                 api_data_source_factory,
-                 api_list_data_source_factory,
-                 object_store):
+    def __init__(self, api_data_source_factory, api_list_data_source_factory):
       self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source_factory = api_list_data_source_factory
-      self._object_store = object_store
 
     def Create(self):
       return ReferenceResolver(
           self._api_data_source_factory.Create(None, disable_refs=True),
           self._api_list_data_source_factory.Create(),
-          self._object_store)
+          ObjectStoreCreator(ReferenceResolver).Create())
 
   def __init__(self, api_data_source, api_list_data_source, object_store):
     self._api_data_source = api_data_source
@@ -125,8 +121,7 @@ class ReferenceResolver(object):
     """Resolve $ref |ref| in namespace |namespace| if not None, returning None
     if it cannot be resolved.
     """
-    link = self._object_store.Get(_MakeKey(namespace, ref, title),
-                                  object_store.REFERENCE_RESOLVER).Get()
+    link = self._object_store.Get(_MakeKey(namespace, ref, title)).Get()
     if link is not None:
       return link
 
@@ -141,9 +136,7 @@ class ReferenceResolver(object):
                               title)
 
     if link is not None:
-      self._object_store.Set(_MakeKey(namespace, ref, title),
-                             link,
-                             object_store.REFERENCE_RESOLVER)
+      self._object_store.Set(_MakeKey(namespace, ref, title), link)
     return link
 
   def SafeGetLink(self, ref, namespace=None, title=None):