Docserver manifest follow up (rewrite)

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

 # 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.
 
 from api_data_source import APIDataSource
 from api_list_data_source import APIListDataSource
 from appengine_wrappers import IsDevServer
 from availability_finder import AvailabilityFinder
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
@@ skipping 82 matching lines @@
     self.sidenav_data_source_factory = SidenavDataSource.Factory(
         self.compiled_host_fs_factory,
         svn_constants.JSON_PATH)
 
     self.manifest_data_source = ManifestDataSource(
         self.compiled_host_fs_factory,
         host_file_system,
         '/'.join((svn_constants.JSON_PATH, 'manifest.json')),
         '/'.join((svn_constants.API_PATH, '_manifest_features.json')))
 
+    self.manifest_data_source = ManifestDataSource(
+        self.compiled_host_fs_factory,
+        host_file_system,
+        '/'.join((svn_constants.JSON_PATH, 'manifest.json')),
+        '/'.join((svn_constants.API_PATH, '_manifest_features.json')))

[not at google - send to devlin, 2013/07/24 21:45:56]

something funny happened here.

[jshumway, 2013/07/26 00:36:46]

Very strange, removed.

+
     self.template_data_source_factory = TemplateDataSource.Factory(
         self.api_data_source_factory,
         self.api_list_data_source_factory,
         self.intro_data_source_factory,
         self.samples_data_source_factory,
         self.sidenav_data_source_factory,
         self.compiled_host_fs_factory,
         self.ref_resolver_factory,
         self.manifest_data_source,
         svn_constants.PUBLIC_TEMPLATE_PATH,
@@ skipping 39 matching lines @@
         object_store_creator)
     trunk_file_system = host_file_system_creator.Create()
     return ServerInstance(
         object_store_creator,
         trunk_file_system,
         EmptyDirFileSystem(),
         '',
         CompiledFileSystem.Factory(trunk_file_system, object_store_creator),
         TestBranchUtility.CreateWithCannedData(),
         host_file_system_creator)