Docserver: there is only one.

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

Index: chrome/common/extensions/docs/server2/patch_servlet.py
diff --git a/chrome/common/extensions/docs/server2/patch_servlet.py b/chrome/common/extensions/docs/server2/patch_servlet.py
index 8704e3895f87fc67c613e437d226e15f914a552d..8207e1d0d4f4414487b6fb8b039ddec7098505f8 100644
--- a/chrome/common/extensions/docs/server2/patch_servlet.py
+++ b/chrome/common/extensions/docs/server2/patch_servlet.py
@@ -28,24 +28,18 @@ class _PatchServletDelegate(RenderServlet.Delegate):
     self._issue = issue
     self._delegate = delegate
 
-  def CreateServerInstanceForChannel(self, channel):
-    base_object_store_creator = ObjectStoreCreator(channel,
-                                                   start_empty=False)
-    branch_utility = self._delegate.CreateBranchUtility(
-        base_object_store_creator)
+  def CreateServerInstance(self):
+    object_store_creator = ObjectStoreCreator(start_empty=False)
+    branch_utility = self._delegate.CreateBranchUtility(object_store_creator)
     host_file_system_creator = self._delegate.CreateHostFileSystemCreator(
-        base_object_store_creator)
+        object_store_creator)
     # TODO(fj): Use OfflineFileSystem here once all json/idl files in api/
     # are pulled into data store by cron jobs.
-    base_file_system = CachingFileSystem(
-        host_file_system_creator.Create(
-            branch_utility.GetChannelInfo(channel).branch),
-        base_object_store_creator)
-    base_compiled_fs_factory = CompiledFileSystem.Factory(
-        base_file_system, base_object_store_creator)
+    base_file_system = CachingFileSystem(host_file_system_creator.Create(),
+                                         object_store_creator)
+    base_compiled_fs_factory = CompiledFileSystem.Factory(base_file_system,
+                                                          object_store_creator)
 
-    object_store_creator = ObjectStoreCreator('trunk@%s' % self._issue,
-                                              start_empty=False)
     rietveld_patcher = CachingRietveldPatcher(
         RietveldPatcher(svn_constants.EXTENSIONS_PATH,
                         self._issue,
@@ -60,11 +54,10 @@ class _PatchServletDelegate(RenderServlet.Delegate):
         [(patched_compiled_fs_factory, patched_file_system),
          (base_compiled_fs_factory, base_file_system)])
 
-    return ServerInstance(channel,
-                          object_store_creator,
+    return ServerInstance(object_store_creator,
                           patched_file_system,
                           self._delegate.CreateAppSamplesFileSystem(
-                              base_object_store_creator),
+                              object_store_creator),
                           '/_patch/%s' % self._issue,
                           compiled_fs_factory,
                           branch_utility,
@@ -90,16 +83,16 @@ class PatchServlet(Servlet):
 
     path_with_issue = self._request.path.lstrip('/')
     if '/' in path_with_issue:
-      issue, real_path = path_with_issue.split('/', 1)
+      issue, path_without_issue = path_with_issue.split('/', 1)
     else:
       return Response.NotFound('Malformed URL. It should look like ' +
           'https://developer.chrome.com/_patch/12345/extensions/...')
 
-    fake_path = '/trunk/%s' % real_path
-
     try:
       response = RenderServlet(
-          Request(fake_path, self._request.host, self._request.headers),
+          Request(path_without_issue,
+                  self._request.host,
+                  self._request.headers),
           _PatchServletDelegate(issue, self._delegate)).Get()
       # Disable cache for patched content.
       response.headers.pop('cache-control', None)
@@ -108,8 +101,6 @@ class PatchServlet(Servlet):
 
     redirect_url, permanent = response.GetRedirect()
     if redirect_url is not None:
-      if redirect_url.startswith('/trunk/'):
-        redirect_url = redirect_url.split('/trunk', 1)[1]
       response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url),
                                    permanent)
     return response