Remove ReferenceResolver dependency in APIDataSource.

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

Index: chrome/common/extensions/docs/server2/server_instance.py
diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py
index 7894f779538f184056d3ec01efc51499b0cf8124..95cb56b8fec5efdecafec63dad2eff8f4155ed58 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -101,13 +101,10 @@ class ServerInstance(object):
         self.features_bundle,
         self.object_store_creator)
 
-    self.ref_resolver_factory = ReferenceResolver.Factory(
-        self.api_data_source_factory,
+    self.ref_resolver = ReferenceResolver(
+        self.api_data_source_factory.Create(None),

[not at google - send to devlin, 2014/03/28 23:02:18]

It's silly that the ReferenceResolver even needs the API data source at all.
It's being given the API models, and that's all it should need.

Something to fix in a follow-up, should be pretty straighforward.

[ahernandez, 2014/03/28 23:10:55]

I think the only reason it needs APIDataSource is because it uses the JSCModel.
Once Jared gets that factored out this should be pretty easy.

         self.api_models,
-        object_store_creator)
-
-    self.api_data_source_factory.SetReferenceResolverFactory(
-        self.ref_resolver_factory)
+        self.object_store_creator.Create(ReferenceResolver))
 
     # Note: samples are super slow in the dev server because it doesn't support
     # async fetch, so disable them.
@@ -124,7 +121,7 @@ class ServerInstance(object):
         extension_samples_fs,
         app_samples_fs,
         CompiledFileSystem.Factory(object_store_creator),
-        self.ref_resolver_factory,
+        self.ref_resolver,
         base_path)
 
     self.api_data_source_factory.SetSamplesDataSourceFactory(
@@ -149,7 +146,7 @@ class ServerInstance(object):
         TableOfContentsRenderer(host_fs_at_trunk,
                                 compiled_fs_factory,
                                 self.template_renderer),
-        self.ref_resolver_factory.Create())
+        self.ref_resolver)
 
   @staticmethod
   def ForTest(file_system=None, file_system_provider=None, base_path='/'):