chrome/test/base/chrome_unit_test_suite.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: chrome/test/base/chrome_unit_test_suite.cc

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

Patch Set: fix Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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

Index: chrome/test/base/chrome_unit_test_suite.cc

diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc

index f58ba4760c57d08edeeb97bc7eb1388879460679..22f518893b4fd23daf2a5f6adcbbc9bb974e5374 100644

--- a/chrome/test/base/chrome_unit_test_suite.cc

+++ b/chrome/test/base/chrome_unit_test_suite.cc

@@ -146,7 +146,8 @@ void ChromeUnitTestSuite::InitializeProviders() {

void ChromeUnitTestSuite::InitializeResourceBundle() {

// Force unittests to run using en-US so if we test against string

// output, it'll pass regardless of the system language.

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

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

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

base::FilePath resources_pack_path;

#if defined(OS_MACOSX) && !defined(OS_IOS)

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

« no previous file with comments | « chrome/service/service_process.cc ('k') | components/test/run_all_unittests.cc » ('j') | ui/base/test/run_all_unittests.cc » ('J')