[Schema Compiler] Separate out SchemaLoader and namespace resolving

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 cpp_type_generator
 import cpp_util
 import h_generator
 import idl_schema
 import json_schema
 import model
 import optparse
 import os
 import shlex
 import urlparse
 from highlighters import (
     pygments_highlighter, none_highlighter, hilite_me_highlighter)
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 from cpp_namespace_environment import CppNamespaceEnvironment
-from schema_loader import SchemaLoader
+from namespace_resolver import NamespaceResolver
 
 
 class CompilerHandler(BaseHTTPRequestHandler):
   """A HTTPRequestHandler that outputs the result of tools/json_schema_compiler.
   """
   def do_GET(self):
     parsed_url = urlparse.urlparse(self.path)
     request_path = self._GetRequestPath(parsed_url)
 
     chromium_favicon = 'http://codereview.chromium.org/static/favicon.ico'
@@ skipping 145 matching lines @@
   def _ShowCompiledFile(self, parsed_url, head, body):
     """Show the compiled version of a json or idl file given the path to the
     compiled file.
     """
     api_model = model.Model()
 
     request_path = self._GetRequestPath(parsed_url)
     (file_root, file_ext) = os.path.splitext(request_path)
     (filedir, filename) = os.path.split(file_root)
 
-    schema_loader = SchemaLoader("./",
-                                 filedir,
-                                 self.server.include_rules,
-                                 self.server.cpp_namespace_pattern)
+    namespace_resolver = NamespaceResolver("./",
+                                           filedir,
+                                           self.server.include_rules,
+                                           self.server.cpp_namespace_pattern)
     try:
       # Get main file.
-      namespace = schema_loader.ResolveNamespace(filename)
+      namespace = namespace_resolver.ResolveNamespace(filename)
       type_generator = cpp_type_generator.CppTypeGenerator(
            api_model,
-           schema_loader,
+           namespace_resolver,
            namespace)
 
       # Generate code
       if file_ext == '.h':
         cpp_code = (h_generator.HGenerator(type_generator)
             .Generate(namespace).Render())
       elif file_ext == '.cc':
         cpp_code = (cc_generator.CCGenerator(type_generator)
             .Generate(namespace).Render())
       else:
@@ skipping 143 matching lines @@
       pass
 
     server = PreviewHTTPServer(('', int(opts.port)),
                                CompilerHandler,
                                highlighters,
                                include_rules,
                                opts.namespace)
     server.serve_forever()
   except KeyboardInterrupt:
     server.socket.close()