Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

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 3f5737c952b851dfe1bde914b22ca0f8ed8b5e0e..57dcbf6ae4e9ba90d942a1607b1142ece4f011aa 100644
--- a/chrome/common/extensions/docs/server2/reference_resolver.py
+++ b/chrome/common/extensions/docs/server2/reference_resolver.py
@@ -52,16 +52,16 @@ class ReferenceResolver(object):
     def __init__(self,
                  api_data_source_factory,
                  api_list_data_source_factory,
-                 object_store_creator_factory):
+                 object_store_creator):
       self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source_factory = api_list_data_source_factory
-      self._object_store_creator_factory = object_store_creator_factory
+      self._object_store_creator = object_store_creator
 
     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_creator_factory.Create(ReferenceResolver).Create())
+          self._object_store_creator.Create(ReferenceResolver))
 
   def __init__(self, api_data_source, api_list_data_source, object_store):
     self._api_data_source = api_data_source