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

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 279 matching lines @@
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
   localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
 
   web_ui_util::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           new_tab_html_idr));
 
-  std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
+  std::string full_html = webui::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
 
   new_tab_incognito_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabHTML() {
   // TODO(estade): these strings should be defined in their relevant handlers
   // (in GetLocalizedValues) and should have more legible names.
   // Show the profile name in the title and most visited labels if the current
   // profile is not the default.
@@ skipping 135 matching lines @@
       switches::kDisableNTPOtherSessionsMenu);
   load_time_data.SetBoolean("showOtherSessionsMenu",
                             show_other_sessions_menu);
   load_time_data.SetBoolean("isUserSignedIn",
       !prefs->GetString(prefs::kGoogleServicesUsername).empty());
 
   // Load the new tab page appropriate for this build
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
       GetRawDataResource(chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
                          IDR_NEW_TAB_SEARCH_HTML : IDR_NEW_TAB_4_HTML));
-  jstemplate_builder::UseVersion2 version2;
+  webui::UseVersion2 version2;
   std::string full_html =
-      jstemplate_builder::GetI18nTemplateHtml(new_tab_html, &load_time_data);
+      webui::GetI18nTemplateHtml(new_tab_html, &load_time_data);
   new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabIncognitoCSS() {
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   DCHECK(tp);
 
   // Get our theme colors
   SkColor color_background =
       GetThemeColor(tp, ThemeService::COLOR_NTP_BACKGROUND);
@@ skipping 110 matching lines @@
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
           IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }