Doc server: support interfaces in src/extensions

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

Index: chrome/common/extensions/docs/server2/api_models.py
diff --git a/chrome/common/extensions/docs/server2/api_models.py b/chrome/common/extensions/docs/server2/api_models.py
index 1875a1e329ac15732de66e410272265e32496bb4..7355d96134de38d4a76e6f714cff775bec7b11db 100644
--- a/chrome/common/extensions/docs/server2/api_models.py
+++ b/chrome/common/extensions/docs/server2/api_models.py
@@ -6,7 +6,7 @@ import os
 import posixpath
 
 from compiled_file_system import SingleFile, Unicode
-from extensions_paths import API
+from extensions_paths import API, CORE_API
 from file_system import FileNotFoundError
 from future import Gettable, Future
 from schema_util import ProcessSchema
@@ -63,14 +63,15 @@ class APIModels(object):
                                         basename.replace('devtools_' , '')))
 
     futures = [self._model_cache.GetFromFile(
-                   posixpath.join(API, '%s.%s' % (file_name, ext)))
-               for ext in ('json', 'idl')]
+                   posixpath.join(api_path, '%s.%s' % (file_name, ext)))
+               for ext in ('json', 'idl')
+               for api_path in (API, CORE_API)]
     def resolve():
       for future in futures:
         try:
           return future.Get()
         except FileNotFoundError: pass
-      # Propagate the first FileNotFoundError if neither were found.
+      # Propagate the first FileNotFoundError if no files were found.
       futures[0].Get()
     return Future(delegate=Gettable(resolve))