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

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

Index: chrome/common/extensions/docs/server2/api_models_test.py
diff --git a/chrome/common/extensions/docs/server2/api_models_test.py b/chrome/common/extensions/docs/server2/api_models_test.py
index 2ccf3d8bccc9f162b439ca775403aa9125eedf39..4d8acd374bb5a6139c852ed4147d3c23483fa954 100755
--- a/chrome/common/extensions/docs/server2/api_models_test.py
+++ b/chrome/common/extensions/docs/server2/api_models_test.py
@@ -9,6 +9,7 @@ import unittest
 
 from api_models import APIModels
 from compiled_file_system import CompiledFileSystem
+from extensions_paths import API, EXTENSIONS
 from features_bundle import FeaturesBundle
 from file_system import FileNotFoundError
 from mock_file_system import MockFileSystem
@@ -20,8 +21,8 @@ from test_util import ReadFile
 _TEST_DATA = {
   'api': {
     'devtools': {
-      'inspected_window.json': ReadFile(os.path.join(
-          'api', 'devtools', 'inspected_window.json')),
+      'inspected_window.json': ReadFile(
+          API, 'devtools', 'inspected_window.json'),
     },
     '_api_features.json': json.dumps({
       'alarms': {},
@@ -36,12 +37,12 @@ _TEST_DATA = {
     }),
     '_manifest_features.json': '{}',
     '_permission_features.json': '{}',
-    'alarms.idl': ReadFile(os.path.join('api', 'alarms.idl')),
-    'declarative_web_request.json': ReadFile(os.path.join(
-        'api', 'declarative_web_request.json')),
-    'experimental_accessibility.json': ReadFile(os.path.join(
-        'api', 'experimental_accessibility.json')),
-    'page_action.json': ReadFile(os.path.join('api', 'page_action.json')),
+    'alarms.idl': ReadFile(API, 'alarms.idl'),
+    'declarative_web_request.json': ReadFile(
+        API, 'declarative_web_request.json'),
+    'experimental_accessibility.json': ReadFile(
+        API, 'experimental_accessibility.json'),
+    'page_action.json': ReadFile(API, 'page_action.json'),
   },
   'docs': {
     'templates': {
@@ -58,7 +59,8 @@ class APIModelsTest(unittest.TestCase):
   def setUp(self):
     object_store_creator = ObjectStoreCreator.ForTest()
     compiled_fs_factory = CompiledFileSystem.Factory(object_store_creator)
-    self._mock_file_system = MockFileSystem(TestFileSystem(_TEST_DATA))
+    self._mock_file_system = MockFileSystem(
+        TestFileSystem(_TEST_DATA, relative_to=EXTENSIONS))
     features_bundle = FeaturesBundle(
         self._mock_file_system, compiled_fs_factory, object_store_creator)
     self._api_models = APIModels(
@@ -82,25 +84,25 @@ class APIModelsTest(unittest.TestCase):
     self.assertEqual('devtools.inspectedWindow',
                      get_model_name('devtools/inspected_window.json'))
     self.assertEqual('devtools.inspectedWindow',
-                     get_model_name('api/devtools/inspected_window.json'))
+                     get_model_name('%s/devtools/inspected_window.json' % API))
     self.assertEqual('alarms', get_model_name('alarms'))
     self.assertEqual('alarms', get_model_name('alarms.idl'))
-    self.assertEqual('alarms', get_model_name('api/alarms.idl'))
+    self.assertEqual('alarms', get_model_name('%s/alarms.idl' % API))
     self.assertEqual('declarativeWebRequest',
                      get_model_name('declarativeWebRequest'))
     self.assertEqual('declarativeWebRequest',
                      get_model_name('declarative_web_request.json'))
     self.assertEqual('declarativeWebRequest',
-                     get_model_name('api/declarative_web_request.json'))
+                     get_model_name('%s/declarative_web_request.json' % API))
     self.assertEqual('experimental.accessibility',
                      get_model_name('experimental.accessibility'))
     self.assertEqual('experimental.accessibility',
                      get_model_name('experimental_accessibility.json'))
     self.assertEqual('experimental.accessibility',
-                     get_model_name('api/experimental_accessibility.json'))
+                     get_model_name('%s/experimental_accessibility.json' % API))
     self.assertEqual('pageAction', get_model_name('pageAction'))
     self.assertEqual('pageAction', get_model_name('page_action.json'))
-    self.assertEqual('pageAction', get_model_name('api/page_action.json'))
+    self.assertEqual('pageAction', get_model_name('%s/page_action.json' % API))
 
   def testGetNonexistentModel(self):
     self.assertRaises(FileNotFoundError,
@@ -108,15 +110,15 @@ class APIModelsTest(unittest.TestCase):
     self.assertRaises(FileNotFoundError,
                       self._api_models.GetModel('notfound.json').Get)
     self.assertRaises(FileNotFoundError,
-                      self._api_models.GetModel('api/notfound.json').Get)
+                      self._api_models.GetModel('%s/notfound.json' % API).Get)
     self.assertRaises(FileNotFoundError,
-                      self._api_models.GetModel('api/alarms.json').Get)
+                      self._api_models.GetModel('%s/alarms.json' % API).Get)
     self.assertRaises(FileNotFoundError,
                       self._api_models.GetModel('storage').Get)
     self.assertRaises(FileNotFoundError,
-                      self._api_models.GetModel('api/storage.json').Get)
+                      self._api_models.GetModel('%s/storage.json' % API).Get)
     self.assertRaises(FileNotFoundError,
-                      self._api_models.GetModel('api/storage.idl').Get)
+                      self._api_models.GetModel('%s/storage.idl' % API).Get)
 
   def testSingleFile(self):
     # 2 stats (1 for JSON and 1 for IDL), 1 read (for IDL file which existed).