Doc Server Manifest Generation Followup

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

Index: chrome/common/extensions/docs/server2/template_data_source.py
diff --git a/chrome/common/extensions/docs/server2/template_data_source.py b/chrome/common/extensions/docs/server2/template_data_source.py
index b57db80196deab3f60890fbebecdaf26810f9e0c..97cb9b043081cfc546d1146c3e2865e308b8228c 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -3,10 +3,8 @@
 # found in the LICENSE file.
 
 import logging
-import os
 
 from branch_utility import BranchUtility
-import compiled_file_system as compiled_fs
 from docs_server_utils import FormatKey
 from file_system import FileNotFoundError
 from third_party.handlebar import Handlebar
@@ -19,6 +17,7 @@ def _MakeChannelDict(channel_name):
     'channels': [{'name': name} for name in BranchUtility.GetAllChannelNames()],
     'current': channel_name
   }
+
   for channel in channel_dict['channels']:
     if channel['name'] == channel_name:
       channel['isCurrent'] = True
@@ -49,6 +48,7 @@ class TemplateDataSource(object):
                  sidenav_data_source_factory,
                  compiled_fs_factory,
                  ref_resolver_factory,
+                 manifest_data_source,
                  public_template_path,
                  private_template_path,
                  static_path):
@@ -63,6 +63,7 @@ class TemplateDataSource(object):
       self._ref_resolver = ref_resolver_factory.Create()
       self._public_template_path = public_template_path
       self._private_template_path = private_template_path
+      self._manifest_data_source = manifest_data_source
       self._static_resources = static_path
 
     def _CreateTemplate(self, template_name, text):
@@ -79,6 +80,7 @@ class TemplateDataSource(object):
           self._samples_data_source_factory.Create(request),
           self._sidenav_data_source_factory.Create(path),
           self._cache,
+          self._manifest_data_source,
           self._public_template_path,
           self._private_template_path,
           self._static_resources)
@@ -91,6 +93,7 @@ class TemplateDataSource(object):
                samples_data_source,
                sidenav_data_source,
                cache,
+               manifest_data_source,
                public_template_path,
                private_template_path,
                static_resources):
@@ -104,6 +107,7 @@ class TemplateDataSource(object):
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path
     self._static_resources = static_resources
+    self._manifest_data_source = manifest_data_source
 
   def Render(self, template_name):
     """This method will render a template named |template_name|, fetching all
@@ -121,6 +125,7 @@ class TemplateDataSource(object):
       'intros': self._intro_data_source,
       'sidenavs': self._sidenav_data_source,
       'partials': self,
+      'manifest_source': self._manifest_data_source,
       'samples': self._samples_data_source,
       'static': self._static_resources,
       'app': 'app',
@@ -149,5 +154,5 @@ class TemplateDataSource(object):
     try:
       return self._cache.GetFromFile(
           '/'.join((base_path, FormatKey(template_name))))
-    except FileNotFoundError as e:
+    except FileNotFoundError:
       return None