Docserver: there is only one.

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

Index: chrome/common/extensions/docs/server2/instance_servlet.py
diff --git a/chrome/common/extensions/docs/server2/instance_servlet.py b/chrome/common/extensions/docs/server2/instance_servlet.py
index 2523d996d47b9520784f1abd5186def52db6d4a3..8f9d3fe674a753c663fff562cdaa043919f64c25 100644
--- a/chrome/common/extensions/docs/server2/instance_servlet.py
+++ b/chrome/common/extensions/docs/server2/instance_servlet.py
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 from appengine_wrappers import IsDevServer
-from branch_utility import BranchUtility
 from caching_file_system import CachingFileSystem
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
@@ -35,25 +34,21 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate):
     self._delegate = delegate
 
   @memoize
-  def CreateServerInstanceForChannel(self, channel):
-    object_store_creator = ObjectStoreCreator(channel, start_empty=False)
-    branch = (self._delegate.CreateBranchUtility(object_store_creator)
-        .GetBranchForChannel(channel))
+  def CreateServerInstance(self):
+    object_store_creator = ObjectStoreCreator(start_empty=False)
     host_file_system = CachingFileSystem(
-        OfflineFileSystem(self._delegate.CreateHostFileSystemForBranch(branch)),
+        OfflineFileSystem(self._delegate.CreateHostFileSystem()),
         object_store_creator)
     app_samples_file_system = self._delegate.CreateAppSamplesFileSystem(
         object_store_creator)
     compiled_host_fs_factory = CompiledFileSystem.Factory(
         host_file_system,
         object_store_creator)
-    return ServerInstance(channel,
-                          object_store_creator,
+    return ServerInstance(object_store_creator,
                           host_file_system,
                           app_samples_file_system,
-                          '/static' if channel == 'stable' else
-                              '/%s/static' % channel,
-                          compiled_host_fs_factory)
+                          compiled_host_fs_factory,
+                          '/static')
 
 class InstanceServlet(object):
   '''Servlet for running on normal AppEngine instances.
@@ -63,11 +58,8 @@ class InstanceServlet(object):
   class Delegate(object):
     '''Allow runtime dependencies to be overriden for testing.
     '''
-    def CreateBranchUtility(self, object_store_creator):
-      return BranchUtility.Create(object_store_creator)
-
-    def CreateHostFileSystemForBranch(self, branch):
-      return SubversionFileSystem.Create(branch)
+    def CreateHostFileSystem(self):
+      return SubversionFileSystem.Create('trunk')
 
     def CreateAppSamplesFileSystem(self, object_store_creator):
       # TODO(kalman): OfflineServerInstance wrapper for GithubFileSystem, but