Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / docs / server2 / template_renderer.py

diff --git a/src/chrome/common/extensions/docs/server2/template_renderer.py b/src/chrome/common/extensions/docs/server2/template_renderer.py
index d2b1147..6b7e7c4 100644 (file)
--- a/src/chrome/common/extensions/docs/server2/template_renderer.py
+++ b/src/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)
@@ -36,21 +36,8 @@ class TemplateRenderer(object):
       'apps_samples_url': GITHUB_BASE,
       'base_path': self._server_instance.base_path,
       'extensions_samples_url': EXTENSIONS_SAMPLES,
-      # TODO(kalman): Figure out where "pepperversion" comes from. It's used
-      # internally in pepper and unfortunately the syntax appears to be
-      # {{pepperversion}} for some reason.
-      'pepperversion': '',
       '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