Add support for references in different paths in apis

tools/json_schema_compiler/cpp_type_generator_test.py

Index: tools/json_schema_compiler/cpp_type_generator_test.py
diff --git a/tools/json_schema_compiler/cpp_type_generator_test.py b/tools/json_schema_compiler/cpp_type_generator_test.py
index f3a760a2adcf5833aa3165bc87776e5231ae669a..0ca955322e2773875ddca36500d1c4716ea63169 100755
--- a/tools/json_schema_compiler/cpp_type_generator_test.py
+++ b/tools/json_schema_compiler/cpp_type_generator_test.py
@@ -26,33 +26,37 @@ class CppTypeGeneratorTest(unittest.TestCase):
 
     self.forbidden_json = CachedLoad('test/forbidden.json')
     self.forbidden = self.models['forbidden'].AddNamespace(
-        self.forbidden_json[0], 'path/to/forbidden.json')
+        self.forbidden_json[0], 'path/to/forbidden.json', '')
     self.permissions_json = CachedLoad('test/permissions.json')
     self.permissions = self.models['permissions'].AddNamespace(
-        self.permissions_json[0], 'path/to/permissions.json')
+        self.permissions_json[0], 'path/to/permissions.json', '')
     self.windows_json = CachedLoad('test/windows.json')
     self.windows = self.models['windows'].AddNamespace(self.windows_json[0],
-                                                       'path/to/window.json')
+                                                       'path/to/window.json',
+                                                       '')
     self.tabs_json = CachedLoad('test/tabs.json')
     self.tabs = self.models['tabs'].AddNamespace(self.tabs_json[0],
-                                                 'path/to/tabs.json')
+                                                 'path/to/tabs.json',
+                                                 '')
     self.browser_action_json = CachedLoad('test/browser_action.json')
     self.browser_action = self.models['browser_action'].AddNamespace(
-        self.browser_action_json[0], 'path/to/browser_action.json')
+        self.browser_action_json[0], 'path/to/browser_action.json', '')
     self.font_settings_json = CachedLoad('test/font_settings.json')
     self.font_settings = self.models['font_settings'].AddNamespace(
-        self.font_settings_json[0], 'path/to/font_settings.json')
+        self.font_settings_json[0], 'path/to/font_settings.json', '')
     self.dependency_tester_json = CachedLoad('test/dependency_tester.json')
     self.dependency_tester = self.models['dependency_tester'].AddNamespace(
-        self.dependency_tester_json[0], 'path/to/dependency_tester.json')
+        self.dependency_tester_json[0], 'path/to/dependency_tester.json', '')
     self.content_settings_json = CachedLoad('test/content_settings.json')
     self.content_settings = self.models['content_settings'].AddNamespace(
-        self.content_settings_json[0], 'path/to/content_settings.json')
+        self.content_settings_json[0], 'path/to/content_settings.json', '')
 
   def testGenerateIncludesAndForwardDeclarations(self):
     m = model.Model()
-    m.AddNamespace(self.windows_json[0], 'path/to/windows.json')
-    m.AddNamespace(self.tabs_json[0], 'path/to/tabs.json')
+    m.AddNamespace(self.windows_json[0],
+                   'path/to/windows.json',
+                   '%(namespace)s')
+    m.AddNamespace(self.tabs_json[0], 'path/to/tabs.json', '%(namespace)s')
     manager = CppTypeGenerator(m, _FakeSchemaLoader(m))
 
     self.assertEquals('', manager.GenerateIncludes().Render())
@@ -62,7 +66,16 @@ class CppTypeGeneratorTest(unittest.TestCase):
         'namespace tabs {\n'
         'struct Tab;\n'
         '}  // namespace tabs',
-        manager.GenerateForwardDeclarations('%(namespace)s').Render())
+        manager.GenerateForwardDeclarations().Render())
+
+    m = model.Model()
+    m.AddNamespace(self.windows_json[0],
+                   'path/to/windows.json',
+                   'foo::bar::%(namespace)s')
+    m.AddNamespace(self.tabs_json[0],
+                   'path/to/tabs.json',
+                   'foo::bar::%(namespace)s')
+    manager = CppTypeGenerator(m, _FakeSchemaLoader(m))
     self.assertEquals(
         'namespace foo {\n'
         'namespace bar {\n'
@@ -71,13 +84,12 @@ class CppTypeGeneratorTest(unittest.TestCase):
         '}  // namespace tabs\n'
         '}  // namespace bar\n'
         '}  // namespace foo',
-        manager.GenerateForwardDeclarations('foo::bar::%(namespace)s').Render())
+        manager.GenerateForwardDeclarations().Render())
     manager = CppTypeGenerator(self.models.get('permissions'),
                                _FakeSchemaLoader(m))
     self.assertEquals('', manager.GenerateIncludes().Render())
     self.assertEquals('', manager.GenerateIncludes().Render())
-    self.assertEquals(
-        '', manager.GenerateForwardDeclarations('%(namespace)s').Render())
+    self.assertEquals('', manager.GenerateForwardDeclarations().Render())
     manager = CppTypeGenerator(self.models.get('content_settings'),
                                _FakeSchemaLoader(m))
     self.assertEquals('', manager.GenerateIncludes().Render())
@@ -86,10 +98,12 @@ class CppTypeGeneratorTest(unittest.TestCase):
     m = model.Model()
     # Insert 'font_settings' before 'browser_action' in order to test that
     # CppTypeGenerator sorts them properly.
-    m.AddNamespace(self.font_settings_json[0], 'path/to/font_settings.json')
-    m.AddNamespace(self.browser_action_json[0], 'path/to/browser_action.json')
+    m.AddNamespace(self.font_settings_json[0], 'path/to/font_settings.json', '')
+    m.AddNamespace(
+        self.browser_action_json[0], 'path/to/browser_action.json', '')
     dependency_tester = m.AddNamespace(self.dependency_tester_json[0],
-                                       'path/to/dependency_tester.json')
+                                       'path/to/dependency_tester.json',
+                                       '')
     manager = CppTypeGenerator(m,
                                _FakeSchemaLoader(m),
                                default_namespace=dependency_tester)
@@ -97,7 +111,7 @@ class CppTypeGeneratorTest(unittest.TestCase):
                       '#include "path/to/font_settings.h"',
                       manager.GenerateIncludes().Render())
     self.assertEquals(
-        '', manager.GenerateForwardDeclarations('%(namespace)s').Render())
+        '', manager.GenerateForwardDeclarations().Render())
 
   def testGetCppTypeSimple(self):
     manager = CppTypeGenerator(self.models.get('tabs'), _FakeSchemaLoader(None))
@@ -147,8 +161,9 @@ class CppTypeGeneratorTest(unittest.TestCase):
 
   def testGetCppTypeIncludedRef(self):
     m = model.Model()
-    m.AddNamespace(self.windows_json[0], 'path/to/windows.json')
-    m.AddNamespace(self.tabs_json[0], 'path/to/tabs.json')
+    m.AddNamespace(
+        self.windows_json[0], 'path/to/windows.json', '%(namespace)s')
+    m.AddNamespace(self.tabs_json[0], 'path/to/tabs.json', '%(namespace)s')
     manager = CppTypeGenerator(m, _FakeSchemaLoader(m))
     self.assertEquals(
         'std::vector<linked_ptr<tabs::Tab> >',