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

chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.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 "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
+#include "grit/common_resources.h"
 #include "grit/generated_resources.h"
-#include "grit/webui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class MockChromeWebUIDataSource : public ChromeWebUIDataSource {
  public:
   MockChromeWebUIDataSource()
       : ChromeWebUIDataSource("host"),
         result_data_(NULL) {
   }
 
   void StartDataRequest(const std::string& path) {
@@ skipping 49 matching lines @@
   source()->AddString("planet", ASCIIToUTF16("pluto"));
   source()->AddLocalizedString("button", IDS_OK);
   source()->StartDataRequest("strings.js");
   std::string result(reinterpret_cast<const char*>(
       source()->result_data_->front()), source()->result_data_->size());
   EXPECT_NE(result.find("\"planet\":\"pluto\""), std::string::npos);
   EXPECT_NE(result.find("\"button\":\"OK\""), std::string::npos);
 }
 
 TEST_F(ChromeWebUIDataSourceTest, DefaultResource) {
-  source()->set_default_resource(IDR_WEBUI_I18N_PROCESS_JS);
+  source()->set_default_resource(IDR_I18N_PROCESS_JS);
   source()->StartDataRequest("foobar" );
   std::string result(
       reinterpret_cast<const char*>(source()->result_data_->front()),
       source()->result_data_->size());
   EXPECT_NE(result.find("i18nTemplate.process"), std::string::npos);
   source()->StartDataRequest("strings.js");
   result = std::string(
       reinterpret_cast<const char*>(source()->result_data_->front()),
       source()->result_data_->size());
   EXPECT_NE(result.find("i18nTemplate.process"), std::string::npos);
 }
 
 TEST_F(ChromeWebUIDataSourceTest, NamedResource) {
-  source()->set_default_resource(IDR_WEBUI_I18N_PROCESS_JS);
-  source()->add_resource_path("foobar", IDR_WEBUI_I18N_TEMPLATE_JS);
+  source()->set_default_resource(IDR_I18N_PROCESS_JS);
+  source()->add_resource_path("foobar", IDR_I18N_TEMPLATE_JS);
   source()->StartDataRequest("foobar");
   std::string result(
       reinterpret_cast<const char*>(source()->result_data_->front()),
       source()->result_data_->size());
   EXPECT_NE(result.find("var i18nTemplate"), std::string::npos);
   source()->StartDataRequest("strings.js");
   result = std::string(
       reinterpret_cast<const char*>(source()->result_data_->front()),
       source()->result_data_->size());
   EXPECT_NE(result.find("i18nTemplate.process"), std::string::npos);
 }
 
 TEST_F(ChromeWebUIDataSourceTest, MimeType) {
   const char* html = "text/html";
   const char* js = "application/javascript";
   EXPECT_EQ(source()->GetMimeType(""), html);
   EXPECT_EQ(source()->GetMimeType("foo"), html);
   EXPECT_EQ(source()->GetMimeType("foo.html"), html);
   EXPECT_EQ(source()->GetMimeType(".js"), js);
   EXPECT_EQ(source()->GetMimeType("foo.js"), js);
   EXPECT_EQ(source()->GetMimeType("js"), html);
   EXPECT_EQ(source()->GetMimeType("foojs"), html);
   EXPECT_EQ(source()->GetMimeType("foo.jsp"), html);
 }