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

Unified Diff: chrome/test/base/chrome_render_view_host_test_harness.cc

Issue 8883001: Makes a couple of tests properly delete aura state. These tests don't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_render_view_host_test_harness.cc
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc
index d75bb8d0fe62efbba10457ac9aeab8c4d23d67d4..26569e7e51f21b89c7c41e4a55806a36195973e2 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -6,6 +6,11 @@
#include "chrome/test/base/testing_profile.h"
+#if defined(USE_AURA)
+#include "ui/aura/root_window.h"
+#include "ui/aura_shell/shell.h"
+#endif
+
ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness()
: RenderViewHostTestHarness() {
}
@@ -25,4 +30,8 @@ void ChromeRenderViewHostTestHarness::SetUp() {
void ChromeRenderViewHostTestHarness::TearDown() {
RenderViewHostTestHarness::TearDown();
+#if defined(USE_AURA)
+ aura_shell::Shell::DeleteInstance();
+ aura::RootWindow::DeleteInstance();
+#endif
}
« no previous file with comments | « chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698