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

Unified Diff: content/test/test_render_view_host.cc

Issue 2891803002: Revert of Backfill some UI tests. (Closed)
Patch Set: Created 3 years, 7 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 | « content/test/test_render_view_host.h ('k') | ui/views/window/dialog_client_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 527fac259ae79809673e559cd3bdc60d79a73ebf..ece1a637fb4177cc712b0a947f755e58d90785ca 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -30,12 +30,7 @@
#include "media/base/video_frame.h"
#include "ui/aura/env.h"
#include "ui/compositor/compositor.h"
-#include "ui/compositor/layer_type.h"
#include "ui/gfx/geometry/rect.h"
-
-#if defined(USE_AURA)
-#include "ui/aura/test/test_window_delegate.h"
-#endif
namespace content {
@@ -78,13 +73,6 @@
#endif
rwh_->SetView(this);
-
-#if defined(USE_AURA)
- window_.reset(new aura::Window(
- aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate()));
- window_->set_owned_by_parent(false);
- window_->Init(ui::LayerType::LAYER_NOT_DRAWN);
-#endif
}
TestRenderWidgetHostView::~TestRenderWidgetHostView() {
@@ -103,11 +91,7 @@
}
gfx::NativeView TestRenderWidgetHostView::GetNativeView() const {
-#if defined(USE_AURA)
- return window_.get();
-#else
return nullptr;
-#endif
}
gfx::NativeViewAccessible TestRenderWidgetHostView::GetNativeViewAccessible() {
« no previous file with comments | « content/test/test_render_view_host.h ('k') | ui/views/window/dialog_client_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698