Refactor the devserver to make it easier to control caching

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 e00bb3ebc8702d82565246e671a4040cdef2403c..96747cb03124c6c62bed66c5c841848f8978c4cb 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -11,8 +11,8 @@ from file_system import FileNotFoundError
 from third_party.handlebar import Handlebar
 import url_constants
 
-# Increment this if there are changes to the data stored about templates.
-_VERSION = 2
+# Increment this if the data model changes for TemplateDataSource.
+_VERSION = 3
 
 EXTENSIONS_URL = '/chrome/extensions'
 
@@ -48,9 +48,8 @@ class TemplateDataSource(object):
                  api_list_data_source_factory,
                  intro_data_source_factory,
                  samples_data_source_factory,
-                 known_issues_data_source,
                  sidenav_data_source_factory,
-                 cache_factory,
+                 compiled_fs_factory,
                  ref_resolver_factory,
                  public_template_path,
                  private_template_path):
@@ -59,11 +58,10 @@ class TemplateDataSource(object):
       self._api_list_data_source_factory = api_list_data_source_factory
       self._intro_data_source_factory = intro_data_source_factory
       self._samples_data_source_factory = samples_data_source_factory
-      self._known_issues_data_source = known_issues_data_source
       self._sidenav_data_source_factory = sidenav_data_source_factory
-      self._cache = cache_factory.Create(self._CreateTemplate,
-                                         compiled_fs.HANDLEBAR,
-                                         version=_VERSION)
+      self._cache = compiled_fs_factory.Create(self._CreateTemplate,
+                                               TemplateDataSource,
+                                               version=_VERSION)
       self._ref_resolver = ref_resolver_factory.Create()
       self._public_template_path = public_template_path
       self._private_template_path = private_template_path
@@ -81,13 +79,11 @@ class TemplateDataSource(object):
           self._api_list_data_source_factory.Create(),
           self._intro_data_source_factory.Create(),
           self._samples_data_source_factory.Create(request),
-          self._known_issues_data_source,
           self._sidenav_data_source_factory.Create(path),
           self._cache,
           self._public_template_path,
           self._private_template_path,
-          self._static_resources,
-          request)
+          self._static_resources)
 
   def __init__(self,
                branch_info,
@@ -95,25 +91,21 @@ class TemplateDataSource(object):
                api_list_data_source,
                intro_data_source,
                samples_data_source,
-               known_issues_data_source,
                sidenav_data_source,
                cache,
                public_template_path,
                private_template_path,
-               static_resources,
-               request):
+               static_resources):
     self._branch_info = branch_info
     self._api_list_data_source = api_list_data_source
     self._intro_data_source = intro_data_source
     self._samples_data_source = samples_data_source
     self._api_data_source = api_data_source
-    self._known_issues_data_source = known_issues_data_source
     self._sidenav_data_source = sidenav_data_source
     self._cache = cache
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path
     self._static_resources = static_resources
-    self._request = request
 
   def Render(self, template_name):
     """This method will render a template named |template_name|, fetching all
@@ -129,7 +121,6 @@ class TemplateDataSource(object):
       'apis': self._api_data_source,
       'branchInfo': self._branch_info,
       'intros': self._intro_data_source,
-      'known_issues': self._known_issues_data_source,
       'sidenavs': self._sidenav_data_source,
       'partials': self,
       'samples': self._samples_data_source,