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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 11103025: Revert 161256 - Fix the crash that was happening on the buildbot (but not trybots, for a strange re… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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: content/renderer/render_view_browsertest.cc
===================================================================
--- content/renderer/render_view_browsertest.cc (revision 161274)
+++ content/renderer/render_view_browsertest.cc (working copy)
@@ -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 @@
mock_keyboard_.reset(new MockKeyboard());
}
+ virtual void SetUp() OVERRIDE {
+ content::RenderViewTest::SetUp();
+ content::ShellMainDelegate::InitializeResourceBundle();
+ }
+
RenderViewImpl* view() {
return static_cast<RenderViewImpl*>(view_);
}
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_browsertest.cc ('k') | content/renderer/render_view_browsertest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698