| Index: chrome/common/extensions/docs/server2/content_providers.py
|
| diff --git a/chrome/common/extensions/docs/server2/content_providers.py b/chrome/common/extensions/docs/server2/content_providers.py
|
| index cc0b9e66ff1fde435c95271df3e60cab0107fddf..4940d6222ccd74f9c989523621f9d10a3f85b2d6 100644
|
| --- a/chrome/common/extensions/docs/server2/content_providers.py
|
| +++ b/chrome/common/extensions/docs/server2/content_providers.py
|
| @@ -123,14 +123,17 @@ class ContentProviders(object):
|
| 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:
|
| - gitiles_config = config['gitiles']
|
| - if 'dir' not in gitiles_config:
|
| - logging.error('%s: "gitiles" must have a "dir" property' % name)
|
| + 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(GitilesFileSystem.Create(),
|
| - gitiles_config['dir'])
|
| + file_system = ChrootFileSystem(self._host_file_system,
|
| + chromium_config['dir'])
|
| elif 'gcs' in config:
|
| gcs_config = config['gcs']
|
| if 'bucket' not in gcs_config:
|
|
|