1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 1b8fc00..a948f80 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -48,11 +48,11 @@ void BrowserWithTestWindowTest::SetUp() {
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
-  root_window_.reset(new aura::RootWindow);
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
   test_activation_client_.reset(
-      new aura::test::TestActivationClient(root_window_.get()));
+      new aura::test::TestActivationClient(root_window));
   test_stacking_client_.reset(
-      new aura::test::TestStackingClient(root_window_.get()));
+      new aura::test::TestStackingClient(root_window));
 #endif
 }
 
@@ -61,7 +61,7 @@ void BrowserWithTestWindowTest::TearDown() {
 #if defined(USE_AURA)
   test_activation_client_.reset();
   test_stacking_client_.reset();
-  root_window_.reset();
+  aura::RootWindow::DeleteInstance();
 #endif
 }