Move the jstemplate resources back to common_resources.grd to fix test issues.

chrome/common/jstemplate_builder.cc

Index: chrome/common/jstemplate_builder.cc
===================================================================
--- chrome/common/jstemplate_builder.cc	(revision 177425)
+++ chrome/common/jstemplate_builder.cc	(working copy)
@@ -11,7 +11,7 @@
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "grit/webui_resources.h"
+#include "grit/common_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -92,7 +92,7 @@
   // fetch and cache the pointer of the jstemplate resource source text.
   static const base::StringPiece jstemplate_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_WEBUI_JSTEMPLATE_JS));
+          IDR_JSTEMPLATE_JS));
 
   if (jstemplate_src.empty()) {
     NOTREACHED() << "Unable to get jstemplate src";
@@ -118,10 +118,10 @@
   // fetch and cache the pointer of the jstemplate resource source text.
   static const base::StringPiece i18n_template_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_WEBUI_I18N_TEMPLATE_JS));
+          IDR_I18N_TEMPLATE_JS));
   static const base::StringPiece i18n_template2_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_WEBUI_I18N_TEMPLATE2_JS));
+          IDR_I18N_TEMPLATE2_JS));
   const base::StringPiece* template_src = g_version2 ?
       &i18n_template2_src : &i18n_template_src;
 
@@ -141,7 +141,7 @@
 
   static const base::StringPiece i18n_process_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_WEBUI_I18N_PROCESS_JS));
+          IDR_I18N_PROCESS_JS));
 
   if (i18n_process_src.empty()) {
     NOTREACHED() << "Unable to get i18n process src";