diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 03:04:29 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 03:04:29 +0000 |
| commit | c422db02d3184a2897a63d2fde9123c6d1f6ea81 (patch) | |
| tree | ba68d332f3596afe00f07fe6ae6e9172a1679e46 /content/renderer/render_view_browsertest.cc | |
| parent | c7278e5bda7913aee955318b240b1446c285609f (diff) | |
| download | chromium_src-c422db02d3184a2897a63d2fde9123c6d1f6ea81.zip chromium_src-c422db02d3184a2897a63d2fde9123c6d1f6ea81.tar.gz chromium_src-c422db02d3184a2897a63d2fde9123c6d1f6ea81.tar.bz2 | |
Revert 161256 - Fix the crash that was happening on the buildbot (but not trybots, for a strange reason) because ResourceBundle was initialized twice for tests that use the RenderViewTest harness.
Review URL: https://codereview.chromium.org/11090061
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/11103025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest.cc')
| -rw-r--r-- | content/renderer/render_view_browsertest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 799b128..fea4664 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -17,6 +17,7 @@ #include "content/renderer/render_view_impl.h" #include "content/shell/shell_content_browser_client.h" #include "content/shell/shell_content_client.h" +#include "content/shell/shell_main_delegate.h" #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" @@ -141,6 +142,11 @@ class RenderViewImplTest : public content::RenderViewTest { mock_keyboard_.reset(new MockKeyboard()); } + virtual void SetUp() OVERRIDE { + content::RenderViewTest::SetUp(); + content::ShellMainDelegate::InitializeResourceBundle(); + } + RenderViewImpl* view() { return static_cast<RenderViewImpl*>(view_); } |