Move code in ui\webui\jstemplate_builder.* to webui namespace for consistency.

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/bind.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 133 matching lines @@
     resource_id = result->second;
   DCHECK_NE(resource_id, -1);
   SendFromResourceBundle(callback, resource_id);
 }
 
 void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(
     const content::URLDataSource::GotDataCallback& callback) {
   std::string template_data;
   web_ui_util::SetFontAndTextDirection(&localized_strings_);
 
-  scoped_ptr<jstemplate_builder::UseVersion2> version2;
+  scoped_ptr<webui::UseVersion2> version2;
   if (json_js_format_v2_)
-    version2.reset(new jstemplate_builder::UseVersion2);
+    version2.reset(new webui::UseVersion2);
 
-  jstemplate_builder::AppendJsonJS(&localized_strings_, &template_data);
+  webui::AppendJsonJS(&localized_strings_, &template_data);
   callback.Run(base::RefCountedString::TakeString(&template_data));
 }
 
 void ChromeWebUIDataSource::SendFromResourceBundle(
     const content::URLDataSource::GotDataCallback& callback, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
           idr));
   callback.Run(response);
 }