| 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 f69db730982c59c12ff6eeda5a032942a4236283..ca81d51fbcdaab20cb5f05732a417e22854a1aad 100644
|
| --- a/content/public/test/render_view_test.cc
|
| +++ b/content/public/test/render_view_test.cc
|
| @@ -60,6 +60,10 @@
|
| #include "content/test/dwrite_font_fake_sender_win.h"
|
| #endif
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "base/path_service.h"
|
| +#endif
|
| +
|
| using blink::WebGestureEvent;
|
| using blink::WebInputEvent;
|
| using blink::WebLocalFrame;
|
| @@ -280,9 +284,18 @@ 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 (!ui::ResourceBundle::HasSharedInstance())
|
| + if (!ui::ResourceBundle::HasSharedInstance()) {
|
| +#if defined(OS_CHROMEOS)
|
| + base::FilePath pak_file;
|
| + bool r = PathService::Get(base::DIR_MODULE, &pak_file);
|
| + DCHECK(r);
|
| + pak_file = pak_file.Append(FILE_PATH_LITERAL("content_shell.pak"));
|
| + ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
|
| +#else
|
| ui::ResourceBundle::InitSharedInstanceWithLocale(
|
| "en-US", NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
|
| +#endif
|
| + }
|
|
|
| compositor_deps_.reset(new FakeCompositorDependencies);
|
| mock_process_.reset(new MockRenderProcess);
|
|
|