Fixes for Python errors in json_schema_compiler preview server.

tools/json_schema_compiler/preview.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.
 """Server for viewing the compiled C++ code from tools/json_schema_compiler.
 """
 
 import cc_generator
 import code
 import compiler
 import cpp_type_generator
 import cpp_util
 import h_generator
 import idl_schema
 import json_schema
 import model
 import optparse
 import os
+import schema_loader
 import sys
 import urlparse
 from highlighters import (
     pygments_highlighter, none_highlighter, hilite_me_highlighter)
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 
 class CompilerHandler(BaseHTTPRequestHandler):
   """A HTTPRequestHandler that outputs the result of tools/json_schema_compiler.
   """
   def do_GET(self):
@@ skipping 175 matching lines @@
 
     request_path = self._GetRequestPath(parsed_url)
     (file_root, file_ext) = os.path.splitext(request_path)
     (filedir, filename) = os.path.split(file_root)
 
     try:
       # Get main file.
       (api_def, file_path) = self._LoadModel(filedir, filename)
       namespace = api_model.AddNamespace(api_def, file_path)
       type_generator = cpp_type_generator.CppTypeGenerator(
-           namespace,
-           compiler.TypeNamespaceResolver(filedir),
-           namespace.unix_name)
+           api_model,
+           schema_loader.SchemaLoader(filedir),
+           namespace)
 
       # Get the model's dependencies.
       for dependency in api_def.get('dependencies', []):
         # Dependencies can contain : in which case they don't refer to APIs,
         # rather, permissions or manifest keys.
         if ':' in dependency:
           continue
         (api_def, file_path) = self._LoadModel(filedir, dependency)
         referenced_namespace = api_model.AddNamespace(api_def, file_path)
         if referenced_namespace:
           type_generator.AddNamespace(referenced_namespace,
               cpp_util.Classname(referenced_namespace.name).lower())
 
       # Generate code
+      cpp_namespace = 'generated_api_schemas'
       if file_ext == '.h':
-        cpp_code = (h_generator.HGenerator(namespace, type_generator)
-            .Generate().Render())
+        cpp_code = (h_generator.HGenerator(type_generator, cpp_namespace)
+            .Generate(namespace).Render())
       elif file_ext == '.cc':
-        cpp_code = (cc_generator.CCGenerator(namespace, type_generator)
-            .Generate().Render())
+        cpp_code = (cc_generator.CCGenerator(type_generator, cpp_namespace)
+            .Generate(namespace).Render())
       else:
         self.send_error(404, "File not found: %s" % request_path)
         return
 
       # Do highlighting on the generated code
       (highlighter_param, style_param) = self._GetHighlighterParams(parsed_url)
       head.Append('<style>' +
           self.server.highlighters[highlighter_param].GetCSS(style_param) +
           '</style>')
       body.Append(self.server.highlighters[highlighter_param]
@@ skipping 107 matching lines @@
       highlighters['pygments'] = pygments_highlighter.PygmentsHighlighter()
     except ImportError as e:
       pass
 
     server = PreviewHTTPServer(('', int(opts.port)),
                                CompilerHandler,
                                highlighters)
     server.serve_forever()
   except KeyboardInterrupt:
     server.socket.close()