Docserver overhaul: Gitiles away from me.

chrome/common/extensions/docs/server2/patch_servlet.py

 # Copyright 2013 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 fnmatch import fnmatch
 import logging
 
-from appengine_url_fetcher import AppEngineUrlFetcher
 from caching_rietveld_patcher import CachingRietveldPatcher
 from chained_compiled_file_system import ChainedCompiledFileSystem
 from environment import IsDevServer
+from environment_wrappers import CreateUrlFetcher
 from extensions_paths import CONTENT_PROVIDERS
 from instance_servlet import InstanceServlet
 from render_servlet import RenderServlet
 from rietveld_patcher import RietveldPatcher, RietveldPatcherError
 from object_store_creator import ObjectStoreCreator
 from patched_file_system import PatchedFileSystem
 from server_instance import ServerInstance
 from servlet import Request, Response, Servlet
 import url_constants
 from gcs_file_system_provider import CloudStorageFileSystemProvider
 
 
 class _PatchServletDelegate(RenderServlet.Delegate):
   def __init__(self, issue, delegate):
     self._issue = issue
     self._delegate = delegate
 
   def CreateServerInstance(self):
     # start_empty=False because a patch can rely on files that are already in
     # the Git repository but not yet pulled into data store by cron jobs (a
     # typical example is to add documentation for an existing API).
     object_store_creator = ObjectStoreCreator(start_empty=False)
 
     unpatched_file_system = self._delegate.CreateHostFileSystemProvider(
         object_store_creator).GetMaster()
 
     rietveld_patcher = CachingRietveldPatcher(
         RietveldPatcher(self._issue,
-                        AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)),
+                        CreateUrlFetcher(url_constants.CODEREVIEW_SERVER)),
         object_store_creator)
 
     patched_file_system = PatchedFileSystem(unpatched_file_system,
                                             rietveld_patcher)
 
     patched_host_file_system_provider = (
         self._delegate.CreateHostFileSystemProvider(
             object_store_creator,
             # The patched file system needs to be online otherwise it'd be
             # impossible to add files in the patches.
             offline=False,
             # The master file system for this creator should be the patched one.
             default_master_instance=patched_file_system))
 
     combined_compiled_fs_factory = ChainedCompiledFileSystem.Factory(
         [unpatched_file_system], object_store_creator)
 
     branch_utility = self._delegate.CreateBranchUtility(object_store_creator)
 
     server_instance = ServerInstance(
         object_store_creator,
         combined_compiled_fs_factory,
         branch_utility,
         patched_host_file_system_provider,
-        self._delegate.CreateGithubFileSystemProvider(object_store_creator),
         CloudStorageFileSystemProvider(object_store_creator),
         base_path='/_patch/%s/' % self._issue)
 
     # HACK: if content_providers.json changes in this patch then the cron needs
     # to be re-run to pull in the new configuration.
     _, _, modified = rietveld_patcher.GetPatchedFiles()
     if CONTENT_PROVIDERS in modified:
       server_instance.content_providers.Refresh().Get()
 
     return server_instance
@@ skipping 32 matching lines @@
       # Disable cache for patched content.
       response.headers.pop('cache-control', None)
     except RietveldPatcherError as e:
       response = Response.NotFound(e.message, {'Content-Type': 'text/plain'})
 
     redirect_url, permanent = response.GetRedirect()
     if redirect_url is not None:
       response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url),
                                    permanent)
     return response