Docserver overhaul: Gitiles away from me.

chrome/common/extensions/docs/server2/object_store_creator.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 cache_chain_object_store import CacheChainObjectStore
 from environment import GetAppVersion
+from environment_wrappers import CreatePersistentObjectStore
 from memcache_object_store import MemcacheObjectStore
 from test_object_store import TestObjectStore
-from persistent_object_store import PersistentObjectStore
 
 _unspecified = object()
 
 class ObjectStoreCreator(object):
   '''Creates ObjectStores with a namespacing and behaviour configuration.
 
   The initial configuration is specified on object store construction. When
   creating ObjectStores via Create this configuration can be overridden (or
   via the variants of Create which do this automatically).
   '''
@@ skipping 49 matching lines @@
                            ('category', category),
                            ('app_version', app_version))
         if value is not None)
 
     if self._disable_wrappers:
       return self._store_type(namespace, start_empty=start_empty)
 
     if self._store_type is not None:
       chain = (self._store_type(namespace),)
     else:
-      chain = (MemcacheObjectStore(namespace), PersistentObjectStore(namespace))
+      chain = (MemcacheObjectStore(namespace),
+               CreatePersistentObjectStore(namespace))
     return CacheChainObjectStore(chain, start_empty=start_empty)