Move chrome.downloads out of experimental to dev

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 70d3e748d7f4a04f96c6c37d186256fd6b1f1cfb..59b8f64a10d17f7232bc2ebc5700d4695c7e0c50 100755
--- a/tools/json_schema_compiler/cpp_type_generator_test.py
+++ b/tools/json_schema_compiler/cpp_type_generator_test.py
@@ -57,22 +57,24 @@ class CppTypeGeneratorTest(unittest.TestCase):
                       manager.GenerateForwardDeclarations().Render())
 
   def testGenerateIncludesAndForwardDeclarationsMultipleTypes(self):
-    m = model.Model()
     self.tabs_json[0]['types'].append(self.permissions_json[0]['types'][0])
-    tabs_namespace = m.AddNamespace(self.tabs_json[0],
-        'path/to/tabs.json')
     self.windows_json[0]['functions'].append(
         self.permissions_json[0]['functions'][1])
+    m = model.Model()
+    # Insert 'windows' before 'tabs' in order to test that they are sorted
+    # properly.
     windows = m.AddNamespace(self.windows_json[0],
         'path/to/windows.json')
+    tabs_namespace = m.AddNamespace(self.tabs_json[0],
+        'path/to/tabs.json')
     manager = CppTypeGenerator('', windows, self.windows.unix_name)
     manager.AddNamespace(tabs_namespace, self.tabs.unix_name)
     self.assertEquals('#include "path/to/tabs.h"',
         manager.GenerateIncludes().Render())
     self.assertEquals(
         'namespace tabs {\n'
-        'struct Tab;\n'
         'struct Permissions;\n'
+        'struct Tab;\n'
         '}\n'
         'namespace windows {\n'
         'struct Window;\n'
@@ -81,16 +83,18 @@ class CppTypeGeneratorTest(unittest.TestCase):
 
   def testGenerateIncludesAndForwardDeclarationsDependencies(self):
     m = model.Model()
-    browser_action_namespace = m.AddNamespace(self.browser_action_json[0],
-        'path/to/browser_action.json')
-    font_settings_namespace = m.AddNamespace(self.font_settings_json[0],
-        'path/to/font_settings.json')
+    # Insert 'font_settings' before 'browser_action' in order to test that
+    # CppTypeGenerator sorts them properly.
     manager = CppTypeGenerator('', self.dependency_tester,
         self.dependency_tester.unix_name)
-    manager.AddNamespace(browser_action_namespace,
-        self.browser_action.unix_name)
+    font_settings_namespace = m.AddNamespace(self.font_settings_json[0],
+        'path/to/font_settings.json')
     manager.AddNamespace(font_settings_namespace,
         self.font_settings.unix_name)
+    browser_action_namespace = m.AddNamespace(self.browser_action_json[0],
+        'path/to/browser_action.json')
+    manager.AddNamespace(browser_action_namespace,
+        self.browser_action.unix_name)
     self.assertEquals('#include "path/to/browser_action.h"\n'
                       '#include "path/to/font_settings.h"',
                       manager.GenerateIncludes().Render())