[Extensions Bindings] Move loadTypeSchema from utils to json_schema

extensions/renderer/resources/json_schema.js

 // Copyright 2014 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.
 
 // -----------------------------------------------------------------------------
 // NOTE: If you change this file you need to touch
 // extension_renderer_resources.grd to have your change take effect.
 // -----------------------------------------------------------------------------
 
 //==============================================================================
@@ skipping 22 matching lines @@
 // - null counts as 'unspecified' for optional values
 // - added the 'choices' property, to allow specifying a list of possible types
 //   for a value
 // - by default an "object" typed schema does not allow additional properties.
 //   if present, "additionalProperties" is to be a schema against which all
 //   additional properties will be validated.
 //==============================================================================
 
 var utils = require('utils');
 var loggingNative = requireNative('logging');
-var getObjectType = requireNative('schema_registry').GetObjectType;
+var schemaRegistry = requireNative('schema_registry');
 var CHECK = loggingNative.CHECK;
 var DCHECK = loggingNative.DCHECK;
+var WARNING = loggingNative.WARNING;
+
+function loadTypeSchema(typeName, defaultSchema) {
+  var parts = $String.split(typeName, '.');
+  if (parts.length == 1) {
+    if (defaultSchema == null) {
+      WARNING('Trying to reference "' + typeName + '" ' +
+              'with neither namespace nor default schema.');
+      return null;
+    }
+    var types = defaultSchema.types;
+  } else {
+    var schemaName = $Array.join($Array.slice(parts, 0, parts.length - 1), '.');
+    var types = schemaRegistry.GetSchema(schemaName).types;
+  }
+  for (var i = 0; i < types.length; ++i) {
+    if (types[i].id == typeName)
+      return types[i];
+  }
+  return null;
+}
 
 function isInstanceOfClass(instance, className) {
   while ((instance = instance.__proto__)) {
     if (instance.constructor.name == className)
       return true;
   }
   return false;
 }
 
 function isOptionalValue(value) {
@@ skipping 76 matching lines @@
  * Classifies a value as one of the JSON schema primitive types. Note that we
  * don't explicitly disallow 'function', because we want to allow functions in
  * the input values.
  */
 utils.defineProperty(JSONSchemaValidator, 'getType', function(value) {
   // If we can determine the type safely in JS, it's fastest to do it here.
   // However, Object types are difficult to classify, so we have to do it in
   // C++.
   var s = typeof value;
   if (s === 'object')
-    return value === null ? 'null' : getObjectType(value);
+    return value === null ? 'null' : schemaRegistry.GetObjectType(value);
   if (s === 'number')
     return value % 1 === 0 ? 'integer' : 'number';
   return s;
 });
 
 /**
  * Add types that may be referenced by validated schemas that reference them
  * with "$ref": <typeId>. Each type must be a valid schema and define an
  * "id" property.
  */
@@ skipping 30 matching lines @@
   if (ref) {
     var type = this.getOrAddType(ref);
     CHECK(type, 'Could not find type ' + ref);
     schemaTypes = $Array.concat(schemaTypes, this.getAllTypesForSchema(type));
   }
   return schemaTypes;
 };
 
 JSONSchemaValidator.prototype.getOrAddType = function(typeName) {
   if (!this.types[typeName])
-    this.types[typeName] = utils.loadTypeSchema(typeName);
+    this.types[typeName] = loadTypeSchema(typeName);
   return this.types[typeName];
 };
 
 /**
  * Returns true if |schema| would accept an argument of type |type|.
  */
 JSONSchemaValidator.prototype.isValidSchemaType = function(type, schema) {
   if (type == 'any')
     return true;
 
@@ skipping 314 matching lines @@
 };
 
 /**
  * Resets errors to an empty list so you can call 'validate' again.
  */
 JSONSchemaValidator.prototype.resetErrors = function() {
   this.errors = [];
 };
 
 exports.$set('JSONSchemaValidator', JSONSchemaValidator);
+exports.$set('loadTypeSchema', loadTypeSchema);