Makes a couple of tests properly delete aura state. These tests don't

run the normal startup flow, so we have to special case them.

BUG=104360
TEST=none
R=ben@chromium.org


Review URL: http://codereview.chromium.org/8883001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113625 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc

@@ -44,4 +44,6 @@ void TabContentsWrapperTestHarness::TearDown() {
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
+
+  ChromeRenderViewHostTestHarness::TearDown();
 }

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
 }