Docserver: make file_system a property of Create

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

Index: chrome/common/extensions/docs/server2/host_file_system_provider.py
diff --git a/chrome/common/extensions/docs/server2/host_file_system_provider.py b/chrome/common/extensions/docs/server2/host_file_system_provider.py
index 3b8cf290b66232d48ce065c0a735809acd622fa4..f9ba4a7ff4223ea888f237009360c9c32ee32e1d 100644
--- a/chrome/common/extensions/docs/server2/host_file_system_provider.py
+++ b/chrome/common/extensions/docs/server2/host_file_system_provider.py
@@ -92,19 +92,17 @@ class HostFileSystemProvider(object):
     return CachingFileSystem(file_system, self._object_store_creator)
 
   @staticmethod
-  def ForLocal(object_store_creator):
+  def ForLocal(object_store_creator, **optargs):
     '''Used in creating a server instance on localhost.
     '''
-    return HostFileSystemProvider(
-        object_store_creator,
-        constructor_for_test=lambda **_: LocalFileSystem.Create())
+    optargs['constructor_for_test'] = lambda **_: LocalFileSystem.Create()

[Jeffrey Yasskin, 2013/10/14 18:52:31]

You can write:

HostFileSystemProvider(
  object_store_creator,
  constructor_for_test=lambda **_: LocalFileSystem.Create(),
  **optargs)

That'll throw an exception if the user passes 'constructor_for_test' into
ForLocal, while yours will silently override their argument, but I suspect that
difference doesn't matter.

[not at google - send to devlin, 2013/10/14 21:03:34]

Done.

+    return HostFileSystemProvider(object_store_creator, **optargs)
 
   @staticmethod
-  def ForTest(file_system, object_store_creator):
+  def ForTest(file_system, object_store_creator, **optargs):
     '''Used in creating a test server instance. The HostFileSystemProvider
     returned here will always return |file_system| when its Create() method is
     called.
     '''
-    return HostFileSystemProvider(
-        object_store_creator,
-        constructor_for_test=lambda **_: file_system)
+    optargs['constructor_for_test'] = lambda **_: file_system
+    return HostFileSystemProvider(object_store_creator, **optargs)