Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Unified Diff: content/public/test/render_view_test.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
« no previous file with comments | « components/test/run_all_unittests.cc ('k') | remoting/base/resources_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index f4e44ca6d064f6bf390dd3281731a373ab83c4ba..725bd0dcda9710e10855dcf287848ac93c434e31 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -176,8 +176,9 @@ void RenderViewTest::SetUp() {
// ResourceBundle isn't initialized (since we have to use a diferent test
// suite implementation than for content_unittests). For browser_tests, this
// is already initialized.
- if (!ResourceBundle::HasSharedInstance())
- ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+ if (!ui::ResourceBundle::HasSharedInstance())
+ ui::ResourceBundle::InitSharedInstanceWithLocale(
+ "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
mock_process_.reset(new MockRenderProcess);
« no previous file with comments | « components/test/run_all_unittests.cc ('k') | remoting/base/resources_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698