3 files changed, 15 insertions, 21 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index b65704a..7c0abe0 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -18,6 +18,10 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/page_transition_types.h"
 
+#if defined(USE_AURA)
+#include "ui/aura_shell/shell.h"
+#endif
+
 using content::BrowserThread;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
@@ -29,7 +33,7 @@ BrowserWithTestWindowTest::BrowserWithTestWindowTest()
   OleInitialize(NULL);
 #endif
 #if defined(USE_AURA)
-  test_activation_client_.reset(new aura::test::TestActivationClient);
+  aura_shell::Shell::CreateInstance(NULL);
 #endif
 }
 
@@ -54,6 +58,9 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
+#if defined(USE_AURA)
+  aura_shell::Shell::DeleteInstance();
+#endif
 }
 
 TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index 34ecb6c..bc71179 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -14,18 +14,6 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/test_activation_client.h"
-#endif
-
-#if defined(USE_AURA)
-namespace aura {
-namespace test {
-class TestActivationClient;
-}
-}
-#endif
-
 class GURL;
 class NavigationController;
 
@@ -119,10 +107,6 @@ class BrowserWithTestWindowTest : public testing::Test {
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
-#if defined(USE_AURA)
-  scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
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 26569e7..fc52a60 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -13,9 +13,16 @@
 
 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness()
     : RenderViewHostTestHarness() {
+#if defined(USE_AURA)
+  aura_shell::Shell::CreateInstance(NULL);
+#endif
 }
 
 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() {
+#if defined(USE_AURA)
+  aura_shell::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
+#endif
 }
 
 TestingProfile* ChromeRenderViewHostTestHarness::profile() {
@@ -30,8 +37,4 @@ void ChromeRenderViewHostTestHarness::SetUp() {
 
 void ChromeRenderViewHostTestHarness::TearDown() {
   RenderViewHostTestHarness::TearDown();
-#if defined(USE_AURA)
-  aura_shell::Shell::DeleteInstance();
-  aura::RootWindow::DeleteInstance();
-#endif
 }