Refactor APIDataSource to work with DataSourceRegistry

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_categorizer import APICategorizer
 from api_data_source import APIDataSource
 from api_list_data_source import APIListDataSource
 from api_models import APIModels
 from availability_finder import AvailabilityFinder
 from compiled_file_system import CompiledFileSystem
@@ skipping 75 matching lines @@
         branch_utility,
         compiled_fs_factory,
         self.host_file_system_iterator,
         host_fs_at_trunk,
         object_store_creator)
 
     self.api_categorizer = APICategorizer(
         host_fs_at_trunk,
         compiled_fs_factory)
 
-    self.api_data_source_factory = APIDataSource.Factory(
-        self.compiled_fs_factory,
-        host_fs_at_trunk,
-        self.availability_finder,
-        self.api_models,
-        self.features_bundle,
-        self.object_store_creator)
-
     self.ref_resolver = ReferenceResolver(
         self.api_models,
         self.object_store_creator.Create(ReferenceResolver))
 
     # Note: samples are super slow in the dev server because it doesn't support
     # async fetch, so disable them.
     if IsDevServer():
       extension_samples_fs = EmptyDirFileSystem()
       app_samples_fs = EmptyDirFileSystem()
     else:
       extension_samples_fs = host_fs_at_trunk
       # TODO(kalman): Re-enable the apps samples, see http://crbug.com/344097.
       app_samples_fs = EmptyDirFileSystem()
       #app_samples_fs = github_file_system_provider.Create(
       #    'GoogleChrome', 'chrome-app-samples')
     self.samples_data_source_factory = SamplesDataSource.Factory(
         extension_samples_fs,
         app_samples_fs,
         CompiledFileSystem.Factory(object_store_creator),
         self.ref_resolver,
         base_path)
 
-    self.api_data_source_factory.SetSamplesDataSourceFactory(
-        self.samples_data_source_factory)
-
     self.content_providers = ContentProviders(
         object_store_creator,
         self.compiled_fs_factory,
         host_fs_at_trunk,
         self.github_file_system_provider,
         self.gcs_file_system_provider)
 
     # TODO(kalman): Move all the remaining DataSources into DataSourceRegistry,
     # then factor out the DataSource creation into a factory method, so that
     # the entire ServerInstance doesn't need to be passed in here.
@@ skipping 35 matching lines @@
                                               store_type=TestObjectStore)
     host_file_system_provider = HostFileSystemProvider.ForLocal(
         object_store_creator)
     return ServerInstance(
         object_store_creator,
         CompiledFileSystem.Factory(object_store_creator),
         TestBranchUtility.CreateWithCannedData(),
         host_file_system_provider,
         GithubFileSystemProvider.ForEmpty(),
         CloudStorageFileSystemProvider(object_store_creator))