Build fixes to get use_aura && !use_ash to build.

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"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
 #if defined(USE_AURA)
-#include "ash/shell.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #endif
 
 namespace {
 
 // View subclass that allows you to specify the preferred size.
 class TestView : public views::View {
  public:
@@ skipping 44 matching lines @@
 
   // 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() {
   ui::CompositorTestSupport::Initialize();
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   ash::Shell::CreateInstance(NULL);
   // The shell runs with a locked screen in tests, so we must clear the event
   // client so it doesn't interfere with event propagation.
   aura::client::SetEventClient(ash::Shell::GetInstance()->GetRootWindow(),
                                NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN) && !defined(USE_AURA)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
     ui_test_utils::RunAllPendingInMessageLoop();
 #endif
     window_ = NULL;
   }
+#if defined(USE_ASH)
+  ash::Shell::DeleteInstance();
+#endif
 #if defined(USE_AURA)
-  ash::Shell::DeleteInstance();
   aura::Env::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
 }
 
 bool ViewEventTestBase::CanResize() const {
   return true;
 }
 
 views::View* ViewEventTestBase::GetContentsView() {
@@ skipping 58 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }