Docserver: refactor the Handler/ServerInstance relationship into a servlet

chrome/common/extensions/docs/server2/template_data_source_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.
 
 import json
 import os
 import sys
 import unittest
 
 from api_data_source import APIDataSource
 from compiled_file_system import CompiledFileSystem
 from local_file_system import LocalFileSystem
 from object_store_creator import ObjectStoreCreator
 from reference_resolver import ReferenceResolver
 from template_data_source import TemplateDataSource
 from test_util import DisableLogging
 from third_party.handlebar import Handlebar
-
-class _FakeRequest(object):
-  pass
+from servlet import Request
 
 class _FakeFactory(object):
   def __init__(self, input_dict=None):
     if input_dict is None:
       self._input_dict = {}
     else:
       self._input_dict = input_dict
 
   def Create(self, *args, **optargs):
     return self._input_dict
@@ skipping 23 matching lines @@
     if api_data is None:
       api_data_factory = APIDataSource.Factory(compiled_fs_factory, 'fake_path')
     else:
       api_data_factory = _FakeFactory(api_data)
     reference_resolver_factory = ReferenceResolver.Factory(
         api_data_factory,
         self._fake_api_list_data_source_factory,
         ObjectStoreCreator.TestFactory())
     @DisableLogging('error')  # "was never set" error
     def create_from_factory(factory):
-      return factory.Create(_FakeRequest(), 'extensions/foo')
+      path = 'extensions/foo'
+      return factory.Create(Request(path, {}), path)
     return create_from_factory(TemplateDataSource.Factory(
         'fake_channel',
         api_data_factory,
         self._fake_api_list_data_source_factory,
         self._fake_intro_data_source_factory,
         self._fake_samples_data_source_factory,
         self._fake_sidenav_data_source_factory,
         compiled_fs_factory,
         reference_resolver_factory,
         '.',
@@ skipping 53 matching lines @@
             compiled_fs_factory,
             api_data=json.loads(self._ReadLocalFile('test1.json'))))
     self._RenderTest(
         'test2',
         self._CreateTemplateDataSource(
             compiled_fs_factory,
             api_data=json.loads(self._ReadLocalFile('test2.json'))))
 
 if __name__ == '__main__':
   unittest.main()