fix ntp/file: pages

chrome/common/jstemplate_builder.cc

 // 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.
 
 // A helper function for using JsTemplate. See jstemplate_builder.h for more
 // info.
 
 #include "chrome/common/jstemplate_builder.h"
 
 #include "base/json/json_file_value_serializer.h"
@@ skipping 99 matching lines @@
   output->append(template_id.data(), template_id.size());
   output->append("');");
   output->append("jstProcess(new JsEvalContext(templateData), tp);");
   output->append("</script>");
 }
 
 void AppendI18nTemplateSourceHtml(std::string* output) {
   // fetch and cache the pointer of the jstemplate resource source text.
   static const base::StringPiece i18n_template_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          g_version2 ? IDR_I18N_TEMPLATE2_JS : IDR_I18N_TEMPLATE_JS));
+          IDR_I18N_TEMPLATE_JS));
+  static const base::StringPiece i18n_template2_src(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_I18N_TEMPLATE2_JS));
+  const base::StringPiece* template_src = g_version2 ?
+      &i18n_template2_src : &i18n_template_src;
 
-  if (i18n_template_src.empty()) {
+  if (template_src->empty()) {
     NOTREACHED() << "Unable to get i18n template src";
     return;
   }
 
   output->append("<script>");
-  output->append(i18n_template_src.data(), i18n_template_src.size());
+  output->append(template_src->data(), template_src->size());
   output->append("</script>");
 }
 
 void AppendI18nTemplateProcessHtml(std::string* output) {
   if (g_version2)
     return;
 
   static const base::StringPiece i18n_process_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_I18N_PROCESS_JS));
 
   if (i18n_process_src.empty()) {
     NOTREACHED() << "Unable to get i18n process src";
     return;
   }
 
   output->append("<script>");
   output->append(i18n_process_src.data(), i18n_process_src.size());
   output->append("</script>");
 }
 
 }  // namespace jstemplate_builder