Docserver: Serve docs out of src/ not src/chrome/common/extensions. This allows

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
 from operator import itemgetter
 import posixpath
 
 from chroot_file_system import ChrootFileSystem
 from content_provider import ContentProvider
+from extensions_paths import CONTENT_PROVIDERS
 from future import Gettable, Future
-from svn_constants import JSON_PATH
 from third_party.json_schema_compiler.memoize import memoize
 
 
-_CONFIG_PATH = '%s/content_providers.json' % JSON_PATH
-
-
 class ContentProviders(object):
   '''Implements the content_providers.json configuration; see
   chrome/common/extensions/docs/templates/json/content_providers.json for its
   current state and a description of the format.
 
   Returns ContentProvider instances based on how they're configured there.
   '''
 
   def __init__(self,
                compiled_fs_factory,
@@ skipping 33 matching lines @@
     path_parts = path.split('/')
     for i in xrange(len(path_parts), -1, -1):
       name_and_config = serve_from_to_config.get('/'.join(path_parts[:i]))
       if name_and_config is not None:
         return (self._CreateContentProvider(name_and_config[0],
                                             name_and_config[1]),
                 '/'.join(path_parts[i:]))
     return None, path
 
   def _GetConfig(self):
-    return self._cache.GetFromFile(_CONFIG_PATH).Get()
+    return self._cache.GetFromFile(CONTENT_PROVIDERS).Get()
 
   def _CreateContentProvider(self, name, config):
     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
@@ skipping 16 matching lines @@
     return ContentProvider(name,
                            self._compiled_fs_factory,
                            file_system,
                            supports_templates=supports_templates,
                            supports_zip=supports_zip)
 
   def Cron(self):
     futures = [self._CreateContentProvider(name, config).Cron()
                for name, config in self._GetConfig().iteritems()]
     return Future(delegate=Gettable(lambda: [f.Get() for f in futures]))