chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc - Issue 12001003: Move the jstemplate resources back to common_resources.grd to fix test issues.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc

Issue 12001003: Move the jstemplate resources back to common_resources.grd to fix test issues. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc

===================================================================

--- chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc (revision 177430)

+++ chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc (working copy)

@@ -6,8 +6,8 @@

#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 {

@@ -77,7 +77,7 @@

}

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()),

@@ -91,8 +91,8 @@

}

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()),

« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/common/common_resources.grd » ('j') | no next file with comments »