Docserver: make file_system a property of Create

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

 # Copyright (c) 2012 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.
 
 import hashlib
 import json
 import logging
 import posixpath
 import re
 import traceback
 
 from compiled_file_system import CompiledFileSystem
 import third_party.json_schema_compiler.json_comment_eater as json_comment_eater
 import third_party.json_schema_compiler.model as model
 import url_constants
 
 DEFAULT_ICON_PATH = 'images/sample-default-icon.png'
 
 class SamplesDataSource(object):
   '''Constructs a list of samples and their respective files and api calls.
   '''
   class Factory(object):
     '''A factory to create SamplesDataSource instances bound to individual
     Requests.
     '''
     def __init__(self,
                  host_file_system,
-                 compiled_host_fs_factory,
                  app_samples_file_system,
-                 compiled_app_samples_fs_factory,
+                 compiled_fs_factory,
                  ref_resolver_factory,
                  extension_samples_path,
                  base_path):
       self._host_file_system = host_file_system
       self._app_samples_file_system = app_samples_file_system
       self._ref_resolver = ref_resolver_factory.Create()
       self._extension_samples_path = extension_samples_path
       self._base_path = base_path
-      self._extensions_cache = compiled_host_fs_factory.Create(
+      self._extensions_cache = compiled_fs_factory.Create(
+          host_file_system,
           self._MakeSamplesList,
           SamplesDataSource,
           category='extensions')
-      self._apps_cache = compiled_app_samples_fs_factory.Create(
+      self._apps_cache = compiled_fs_factory.Create(
+          app_samples_file_system,
           lambda *args: self._MakeSamplesList(*args, is_apps=True),
           SamplesDataSource,
           category='apps')
 
     def Create(self, request):
       '''Returns a new SamplesDataSource bound to |request|.
       '''
       return SamplesDataSource(self._extensions_cache,
                                self._apps_cache,
                                self._extension_samples_path,
@@ skipping 187 matching lines @@
       else:
         dict_['id'] = self._GetSampleId(name)
         return_list.append(dict_)
     return return_list
 
   def get(self, key):
     return {
       'apps': lambda: self._CreateSamplesDict('apps'),
       'extensions': lambda: self._CreateSamplesDict('extensions')
     }.get(key, lambda: {})()