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

chrome/test/base/view_event_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 "chrome/test/base/view_event_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
@@ skipping 50 matching lines @@
 
 ViewEventTestBase::ViewEventTestBase()
   : window_(NULL),
     content_view_(NULL),
     ui_thread_(content::BrowserThread::UI, &message_loop_) {
 }
 
 void ViewEventTestBase::Done() {
   MessageLoop::current()->Quit();
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   // We need to post a message to tickle the Dispatcher getting called and
   // exiting out of the nested loop. Without this the quit never runs.
   PostMessage(window_->GetNativeWindow(), WM_USER, 0, 0);
 #endif
 
   // If we're in a nested message loop, as is the case with menus, we
   // need to quit twice. The second quit does that for us. Finish all
   // pending UI events before posting closure because events it may be
   // executed before UI events are executed.
   ui_controls::RunClosureAfterAllPendingUIEvents(MessageLoop::QuitClosure());
 }
 
 void ViewEventTestBase::SetUp() {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_AURA)
+  ash::Shell::GetRootWindow();
   ash::Shell::CreateInstance(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
     ui_test_utils::RunAllPendingInMessageLoop();
 #endif
     window_ = NULL;
   }
 #if defined(USE_AURA)
   ash::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 bool ViewEventTestBase::CanResize() const {
   return true;
@@ skipping 19 matching lines @@
   return content_view_->GetWidget();
 }
 
 ViewEventTestBase::~ViewEventTestBase() {
 }
 
 void ViewEventTestBase::StartMessageLoopAndRunTest() {
   window_->Show();
   // Make sure the window is the foreground window, otherwise none of the
   // mouse events are going to be targeted correctly.
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   SetForegroundWindow(window_->GetNativeWindow());
 #endif
 
   // Flush any pending events to make sure we start with a clean slate.
   ui_test_utils::RunAllPendingInMessageLoop();
 
   // Schedule a task that starts the test. Need to do this as we're going to
   // run the message loop.
   MessageLoop::current()->PostTask(
       FROM_HERE,
@@ skipping 21 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }