Docserver: SidenavDataSource refactor, transition to DataSourceRegistry

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 a2b936a2052409a06058f714f5bea6e226fba765..ef92a06c44d3b99500f7f6fb2167da8dfe471475 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -7,7 +7,6 @@ from api_list_data_source import APIListDataSource
 from appengine_wrappers import IsDevServer
 from availability_finder import AvailabilityFinder
 from compiled_file_system import CompiledFileSystem
-from data_source_registry import CreateDataSources
 from empty_dir_file_system import EmptyDirFileSystem
 from example_zipper import ExampleZipper
 from host_file_system_creator import HostFileSystemCreator
@@ -19,7 +18,6 @@ from permissions_data_source import PermissionsDataSource
 from redirector import Redirector
 from reference_resolver import ReferenceResolver
 from samples_data_source import SamplesDataSource
-from sidenav_data_source import SidenavDataSource
 import svn_constants
 from template_data_source import TemplateDataSource
 from test_branch_utility import TestBranchUtility
@@ -100,10 +98,6 @@ class ServerInstance(object):
         self.ref_resolver_factory,
         [svn_constants.INTRO_PATH, svn_constants.ARTICLE_PATH])
 
-    self.sidenav_data_source_factory = SidenavDataSource.Factory(
-        self.compiled_host_fs_factory,
-        svn_constants.JSON_PATH)
-
     self.permissions_data_source = PermissionsDataSource(
         self.compiled_host_fs_factory,
         self.host_file_system,
@@ -124,6 +118,7 @@ class ServerInstance(object):
         svn_constants.PUBLIC_TEMPLATE_PATH)
 
     self.strings_json_path = '/'.join((svn_constants.JSON_PATH, 'strings.json'))
+    self.sidenav_json_base_path = svn_constants.JSON_PATH
     self.manifest_json_path = '/'.join(
         (svn_constants.JSON_PATH, 'manifest.json'))
     self.manifest_features_path = '/'.join(
@@ -134,16 +129,12 @@ class ServerInstance(object):
         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.permissions_data_source,
         svn_constants.PUBLIC_TEMPLATE_PATH,
         svn_constants.PRIVATE_TEMPLATE_PATH,
-        base_path,
-        # TODO(jshumway): Remove this hack after data source registry
-        # transition, ServerInstance should not know about DataSourceRegistry.
-        CreateDataSources(self))
+        base_path)
 
     self.api_data_source_factory.SetTemplateDataSource(
         self.template_data_source_factory)