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

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 8432020: aura: Work around RenderWidgetHostTest.Background segfault. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index c38224f2737555904704ca815eeaa740f9f9aa28..9d7024f3e50ca96b1ade6d77a9ea31a3d413c003 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -21,6 +21,10 @@
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas_skia.h"
+#if defined(USE_AURA)
+#include "content/browser/renderer_host/render_widget_host_view_aura.h"
+#endif
+
using base::TimeDelta;
using content::BrowserThreadImpl;
@@ -426,6 +430,10 @@ TEST_F(RenderWidgetHostTest, Background) {
#if !defined(OS_MACOSX)
scoped_ptr<RenderWidgetHostView> view(
content::GetContentClient()->browser()->CreateViewForWidget(host_.get()));
+#if defined(USE_AURA)
+ // TODO(derat): Call this on all platforms: http://crbug.com/102450.
+ static_cast<RenderWidgetHostViewAura*>(view.get())->InitAsChild();
+#endif
host_->SetView(view.get());
// Create a checkerboard background to test with.

Powered by Google App Engine
This is Rietveld 408576698