switch ntp to jstemplate v2

chrome/browser/ui/webui/chrome_web_ui_data_source.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.
 
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 
 #include <string>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_util.h"
@@ skipping 57 matching lines @@
     if (result != path_to_idr_map_.end())
       resource_id = result->second;
     DCHECK_NE(resource_id, -1);
     SendFromResourceBundle(request_id, resource_id);
   }
 }
 
 void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(int request_id) {
   std::string template_data;
   SetFontAndTextDirection(&localized_strings_);
+
+  scoped_ptr<jstemplate_builder::UseVersion2> version2;
   if (json_js_format_v2_)
-    jstemplate_builder::AppendJsonJS2(&localized_strings_, &template_data);
-  else
-    jstemplate_builder::AppendJsonJS(&localized_strings_, &template_data);
+    version2.reset(new jstemplate_builder::UseVersion2);
+
+  jstemplate_builder::AppendJsonJS(&localized_strings_, &template_data);
   SendResponse(request_id, base::RefCountedString::TakeString(&template_data));
 }
 
 void ChromeWebUIDataSource::SendFromResourceBundle(int request_id, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(idr));
   SendResponse(request_id, response);
 }