Revert 136296 - Make all extension api types fully qualified.

tools/json_schema_compiler/model_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from json_schema import CachedLoad
 import model
 import unittest
 
 class ModelTest(unittest.TestCase):
@@ skipping 14 matching lines @@
 
   def testNamespaces(self):
     self.assertEquals(3, len(self.model.namespaces))
     self.assertTrue(self.permissions)
 
   def testHasFunctions(self):
     self.assertEquals(["contains", "getAll", "remove", "request"],
         sorted(self.permissions.functions.keys()))
 
   def testHasTypes(self):
-    self.assertEquals(['tabs.Tab'], self.tabs.types.keys())
-    self.assertEquals(['permissions.Permissions'],
-        self.permissions.types.keys())
-    self.assertEquals(['windows.Window'], self.windows.types.keys())
+    self.assertEquals(['Tab'], self.tabs.types.keys())
+    self.assertEquals(['Permissions'], self.permissions.types.keys())
+    self.assertEquals(['Window'], self.windows.types.keys())
 
   def testHasProperties(self):
     self.assertEquals(["active", "favIconUrl", "highlighted", "id",
         "incognito", "index", "pinned", "selected", "status", "title", "url",
         "windowId"],
-        sorted(self.tabs.types['tabs.Tab'].properties.keys()))
+        sorted(self.tabs.types['Tab'].properties.keys()))
 
   def testProperties(self):
-    string_prop = self.tabs.types['tabs.Tab'].properties['status']
+    string_prop = self.tabs.types['Tab'].properties['status']
     self.assertEquals(model.PropertyType.STRING, string_prop.type_)
-    integer_prop = self.tabs.types['tabs.Tab'].properties['id']
+    integer_prop = self.tabs.types['Tab'].properties['id']
     self.assertEquals(model.PropertyType.INTEGER, integer_prop.type_)
-    array_prop = self.windows.types['windows.Window'].properties['tabs']
+    array_prop = self.windows.types['Window'].properties['tabs']
     self.assertEquals(model.PropertyType.ARRAY, array_prop.type_)
     self.assertEquals(model.PropertyType.REF, array_prop.item_type.type_)
-    self.assertEquals('tabs.Tab', array_prop.item_type.ref_type)
+    self.assertEquals('Tab', array_prop.item_type.ref_type)
     object_prop = self.tabs.functions['query'].params[0]
     self.assertEquals(model.PropertyType.OBJECT, object_prop.type_)
     self.assertEquals(
         ["active", "highlighted", "pinned", "status", "title", "url",
          "windowId", "windowType"],
         sorted(object_prop.properties.keys()))
 
   def testChoices(self):
     self.assertEquals(model.PropertyType.CHOICES,
         self.tabs.functions['move'].params[0].type_)
@@ skipping 33 matching lines @@
       'FOOBar': 'foo_bar',
       'foo.bar': 'foo_bar',
       'foo.BAR': 'foo_bar',
       'foo.barBAZ': 'foo_bar_baz'
       }
     for name in expectations:
       self.assertEquals(expectations[name], model._UnixName(name));
 
 if __name__ == '__main__':
   unittest.main()