Linking AvailabilityFinder with APIDataSource and intro-table templates.

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

Index: chrome/common/extensions/docs/server2/patch_servlet.py
diff --git a/chrome/common/extensions/docs/server2/patch_servlet.py b/chrome/common/extensions/docs/server2/patch_servlet.py
index 32e1f92e00d08fc4cabb4681649a46bae271d935..a60735c1db862529c4514a1db08300054a894e3a 100644
--- a/chrome/common/extensions/docs/server2/patch_servlet.py
+++ b/chrome/common/extensions/docs/server2/patch_servlet.py
@@ -12,6 +12,7 @@ from caching_file_system import CachingFileSystem
 from caching_rietveld_patcher import CachingRietveldPatcher
 from chained_compiled_file_system import ChainedCompiledFileSystem
 from compiled_file_system import  CompiledFileSystem
+from host_file_system_creator import HostFileSystemCreator
 from instance_servlet import InstanceServlet
 from render_servlet import RenderServlet
 from rietveld_patcher import RietveldPatcher, RietveldPatcherError
@@ -30,10 +31,13 @@ class _PatchServletDelegate(RenderServlet.Delegate):
   def CreateServerInstanceForChannel(self, channel):
     base_object_store_creator = ObjectStoreCreator(channel,
                                                    start_empty=False)
+    branch_utility = self._delegate.CreateBranchUtility(
+        base_object_store_creator)
     # TODO(fj): Use OfflineFileSystem here once all json/idl files in api/
     # are pulled into data store by cron jobs.
     base_file_system = CachingFileSystem(
-        self._delegate.CreateHostFileSystemForBranch(channel),
+        self._delegate.CreateHostFileSystem(
+            branch_utility.GetChannelInfo(channel).branch),
         base_object_store_creator)
     base_compiled_fs_factory = CompiledFileSystem.Factory(
         base_file_system, base_object_store_creator)
@@ -53,13 +57,22 @@ class _PatchServletDelegate(RenderServlet.Delegate):
     compiled_fs_factory = ChainedCompiledFileSystem.Factory(
         [(patched_compiled_fs_factory, patched_file_system),
          (base_compiled_fs_factory, base_file_system)])
+
+    host_file_system_creator = HostFileSystemCreator(
+        branch_utility,
+        self._delegate.CreateHostFileSystem,
+        base_object_store_creator,
+        offline=False)

[not at google - send to devlin, 2013/07/09 23:11:55]

=False also not needed here

[epeterson, 2013/07/16 00:28:23]

Done.

+
     return ServerInstance(channel,
                           object_store_creator,
                           patched_file_system,
                           self._delegate.CreateAppSamplesFileSystem(
                               base_object_store_creator),
                           '/_patch/%s' % self._issue,
-                          compiled_fs_factory)
+                          compiled_fs_factory,
+                          branch_utility,
+                          host_file_system_creator)
 
 class PatchServlet(Servlet):
   '''Servlet which renders patched docs.