Docserver: Use GitilesFileSystem instead of SubversionFileSystem

chrome/common/extensions/docs/server2/content_providers.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.
 
 import logging
 import os
 import traceback
 
 from chroot_file_system import ChrootFileSystem
 from content_provider import ContentProvider
@@ skipping 105 matching lines @@
     default_extensions = config.get('defaultExtensions', ())
     supports_templates = config.get('supportsTemplates', False)
     supports_zip = config.get('supportsZip', False)
 
     if 'chromium' in config:
       chromium_config = config['chromium']
       if 'dir' not in chromium_config:
         logging.error('%s: "chromium" must have a "dir" property' % name)
         return None
       file_system = ChrootFileSystem(self._host_file_system,
+
+                                     chromium_config['dir'])
+    # TODO(rockot): Remove this in a future patch. It should not be needed once
+    # the new content_providers.json is committed.
+    elif 'gitiles' in config:
+      chromium_config = config['gitiles']
+      if 'dir' not in chromium_config:
+        logging.error('%s: "chromium" must have a "dir" property' % name)
+        return None
+      file_system = ChrootFileSystem(self._host_file_system,
                                      chromium_config['dir'])
-    elif 'gitiles' in config:
-      gitiles_config = config['gitiles']
-      if 'dir' not in gitiles_config:
-        logging.error('%s: "gitiles" must have a "dir" property' % name)
-        return None
-      file_system = ChrootFileSystem(GitilesFileSystem.Create(),
-                                     gitiles_config['dir'])
     elif 'gcs' in config:
       gcs_config = config['gcs']
       if 'bucket' not in gcs_config:
         logging.error('%s: "gcs" must have a "bucket" property' % name)
         return None
       bucket = gcs_config['bucket']
       if not bucket.startswith('gs://'):
         logging.error('%s: bucket %s should start with gs://' % (name, bucket))
         return None
       bucket = bucket[len('gs://'):]
@@ skipping 36 matching lines @@
           logging.error('Error %s Cron for ContentProvider "%s":\n%s' %
                         (action, name, traceback.format_exc()))
         return None
 
     futures = [(name, safe(name,
                            'initializing',
                            self._CreateContentProvider(name, config).Cron))
                for name, config in self._GetConfig().iteritems()]
     return Future(callback=
         lambda: [safe(name, 'resolving', f.Get) for name, f in futures if f])