Docserver: Factor SamplesModel out of SamplesDataSource

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

Index: chrome/common/extensions/docs/server2/template_renderer.py
diff --git a/chrome/common/extensions/docs/server2/template_renderer.py b/chrome/common/extensions/docs/server2/template_renderer.py
index ccab9f9da0ae943213e7c076f019967a47b8a325..6b7e7c4eb2499ee655c5267696e5e6d6f6edfa8a 100644
--- a/chrome/common/extensions/docs/server2/template_renderer.py
+++ b/chrome/common/extensions/docs/server2/template_renderer.py
@@ -28,7 +28,7 @@ class TemplateRenderer(object):
     rendering the template.
     '''
     assert isinstance(template, Handlebar), type(template)
-    render_context = self._CreateDataSources(request)
+    render_context = CreateDataSources(self._server_instance, request)
     if data_sources is not None:
       render_context = dict((name, d) for name, d in render_context.iteritems()
                             if name in data_sources)
@@ -38,15 +38,6 @@ class TemplateRenderer(object):
       'extensions_samples_url': EXTENSIONS_SAMPLES,
       'static': self._server_instance.base_path + 'static',
     })
-    if additional_context:
-      render_context.update(additional_context)
+    render_context.update(additional_context or {})
     render_data = template.Render(render_context)
     return render_data.text, render_data.errors
-
-  def _CreateDataSources(self, request):
-    server_instance = self._server_instance
-    data_sources = CreateDataSources(server_instance, request=request)
-    data_sources.update({
-      'samples': server_instance.samples_data_source_factory.Create(request),
-    })
-    return data_sources