Docserver: make file_system a property of Create

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

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from appengine_wrappers import IsDevServer
 from branch_utility import BranchUtility
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
 from github_file_system import GithubFileSystem
 from host_file_system_provider import HostFileSystemProvider
@@ skipping 22 matching lines @@
 
   @memoize
   def CreateServerInstance(self):
     object_store_creator = ObjectStoreCreator(start_empty=False)
     branch_utility = self._delegate.CreateBranchUtility(object_store_creator)
     host_file_system_provider = self._delegate.CreateHostFileSystemProvider(
         object_store_creator,
         offline=True)
     app_samples_file_system = self._delegate.CreateAppSamplesFileSystem(
         object_store_creator)
-    compiled_host_fs_factory = CompiledFileSystem.Factory(
-        host_file_system_provider.GetTrunk(),
-        object_store_creator)
     return ServerInstance(object_store_creator,
                           app_samples_file_system,
-                          compiled_host_fs_factory,
+                          CompiledFileSystem.Factory(object_store_creator),
                           branch_utility,
                           host_file_system_provider)
 
 class InstanceServlet(object):
   '''Servlet for running on normal AppEngine instances.
   Create this via GetConstructor() so that cache state can be shared amongst
   them via the memoizing Delegate.
   '''
   class Delegate(object):
     '''Allow runtime dependencies to be overriden for testing.
@@ skipping 11 matching lines @@
               GithubFileSystem.Create(object_store_creator))
 
   @staticmethod
   def GetConstructor(delegate_for_test=None):
     render_servlet_delegate = OfflineRenderServletDelegate(
         delegate_for_test or InstanceServlet.Delegate())
     return lambda request: RenderServlet(request, render_servlet_delegate)
 
   # NOTE: if this were a real Servlet it would implement a Get() method, but
   # GetConstructor returns an appropriate lambda function (Request -> Servlet).