Nukes USE_AURA ifdefs from views

ui/views/test/widget_test.cc

 // Copyright 2013 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/widget_test.h"
 
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/widget/root_view.h"
 
 namespace views {
 namespace test {
 
-// A widget that assumes mouse capture always works. It won't on Aura in
-// testing, so we mock it.
-#if defined(USE_AURA)
+// A widget that assumes mouse capture always works. It won't in testing, so we
+// mock it.
 NativeWidgetCapture::NativeWidgetCapture(
     internal::NativeWidgetDelegate* delegate)
-    : NativeWidgetPlatform(delegate),
+    : NativeWidgetAura(delegate),
       mouse_capture_(false) {}
 NativeWidgetCapture::~NativeWidgetCapture() {}
 
 void NativeWidgetCapture::SetCapture() {
   mouse_capture_ = true;
 }
 
 void NativeWidgetCapture::ReleaseCapture() {
   if (mouse_capture_)
     delegate()->OnMouseCaptureLost();
   mouse_capture_ = false;
 }
 
 bool NativeWidgetCapture::HasCapture() const {
   return mouse_capture_;
 }
-#endif
 
 WidgetTest::WidgetTest() {}
 WidgetTest::~WidgetTest() {}
 
 NativeWidget* WidgetTest::CreatePlatformNativeWidget(
     internal::NativeWidgetDelegate* delegate) {
-  return new NativeWidgetPlatformForTest(delegate);
+  return new NativeWidgetCapture(delegate);
 }
 
 Widget* WidgetTest::CreateTopLevelPlatformWidget() {
   Widget* toplevel = new Widget;
   Widget::InitParams toplevel_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   toplevel_params.native_widget = CreatePlatformNativeWidget(toplevel);
   toplevel->Init(toplevel_params);
   return toplevel;
 }
@@ skipping 46 matching lines @@
 View* WidgetTest::GetMouseMoveHandler(internal::RootView* root_view) {
   return root_view->mouse_move_handler_;
 }
 
 View* WidgetTest::GetGestureHandler(internal::RootView* root_view) {
   return root_view->gesture_handler_;
 }
 
 }  // namespace test
 }  // namespace views