Docserver: there is only one.

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

Index: chrome/common/extensions/docs/server2/server_instance.py
diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py
index 4641a0d32e008a1e8716a858293869424e918187..7aa91396c8fd0a635269ff40154d0248592ed4bf 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -36,14 +36,11 @@ import url_constants
 
 class ServerInstance(object):
   def __init__(self,
-               channel,
                object_store_creator,
                host_file_system,
                app_samples_file_system,
-               static_path,
-               compiled_fs_factory):
-    self.channel = channel
-
+               compiled_fs_factory,
+               static_path):
     self.object_store_creator = object_store_creator
 
     self.host_file_system = host_file_system
@@ -76,7 +73,6 @@ class ServerInstance(object):
     else:
       extension_samples_fs = self.host_file_system
     self.samples_data_source_factory = SamplesDataSource.Factory(
-        channel,
         extension_samples_fs,
         CompiledFileSystem.Factory(extension_samples_fs, object_store_creator),
         self.app_samples_file_system,
@@ -98,7 +94,6 @@ class ServerInstance(object):
         svn_constants.JSON_PATH)
 
     self.template_data_source_factory = TemplateDataSource.Factory(
-        channel,
         self.api_data_source_factory,
         self.api_list_data_source_factory,
         self.intro_data_source_factory,
@@ -115,7 +110,6 @@ class ServerInstance(object):
         svn_constants.DOCS_PATH)
 
     self.path_canonicalizer = PathCanonicalizer(
-        channel,
         self.compiled_host_fs_factory)
 
     self.content_cache = self.compiled_host_fs_factory.CreateIdentity(
@@ -124,26 +118,22 @@ class ServerInstance(object):
   @staticmethod
   def ForTest(file_system):
     object_store_creator = ObjectStoreCreator.ForTest()
-    return ServerInstance('test',
-                          object_store_creator,
+    return ServerInstance(object_store_creator,
                           file_system,
                           EmptyDirFileSystem(),
-                          '/static',
                           CompiledFileSystem.Factory(file_system,
-                                                     object_store_creator))
+                                                     object_store_creator),
+                          '/static')
 
   @staticmethod
   def ForLocal():
-    channel = 'trunk'
-    object_store_creator = ObjectStoreCreator(channel,
-                                              start_empty=False,
+    object_store_creator = ObjectStoreCreator(start_empty=False,
                                               store_type=TestObjectStore)
     file_system = CachingFileSystem(LocalFileSystem.Create(),
                                     object_store_creator)
     return ServerInstance(
-        channel,
         object_store_creator,
         file_system,
         EmptyDirFileSystem(),
-        '/static',
-        CompiledFileSystem.Factory(file_system, object_store_creator))
+        CompiledFileSystem.Factory(file_system, object_store_creator),
+        '/static')