components/test/run_all_unittests.cc - Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

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: components/test/run_all_unittests.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 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: components/test/run_all_unittests.cc

diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc

index ca4e064fcf58ab7a1ad43bb2f8c10e9d73912d96..1cee176940ba7e4a60ffc5f9250f9fdfb1a1a02f 100644

--- a/components/test/run_all_unittests.cc

+++ b/components/test/run_all_unittests.cc

@@ -76,7 +76,8 @@ class ComponentsTestSuite : public base::TestSuite {

// TODO(tfarina): This should be changed to InitSharedInstanceWithPakFile()

// so we can load our pak file instead of chrome.pak. crbug.com/348563

- ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

+ "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);

base::FilePath resources_pack_path;

PathService::Get(base::DIR_MODULE, &resources_pack_path);

ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(

« no previous file with comments | « chrome/test/base/chrome_unit_test_suite.cc ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »