Remove the singleton instance get/delete methods from RootWindow (yay)

ui/views/test/views_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/test/views_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
@@ skipping 69 matching lines @@
   CHECK(teardown_called_)
       << "You have overrideen TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 #if defined(USE_AURA)
-  root_window_ = aura::RootWindow::GetInstance();
+  root_window_.reset(new aura::RootWindow);
   root_window_->SetProperty(
       aura::client::kRootWindowInputMethodKey,
       test_input_method_.get());
   test_activation_client_.reset(
-      new aura::test::TestActivationClient(root_window_));
+      new aura::test::TestActivationClient(root_window_.get()));
   test_stacking_client_.reset(
-      new aura::test::TestStackingClient(root_window_));
+      new aura::test::TestStackingClient(root_window_.get()));
 #endif
 }
 
 void ViewsTestBase::TearDown() {
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunPendingMessages();
   teardown_called_ = true;
   views_delegate_.reset();
   testing::Test::TearDown();
 #if defined(USE_AURA)
   test_stacking_client_.reset();
   test_activation_client_.reset();
-  aura::RootWindow::DeleteInstance();
+  root_window_.reset();
 #endif
 }
 
 void ViewsTestBase::RunPendingMessages() {
 #if defined(USE_AURA)
   message_loop_.RunAllPendingWithDispatcher(
       aura::Env::GetInstance()->GetDispatcher());
 #else
   message_loop_.RunAllPending();
 #endif
 }
 
 }  // namespace views