Nukes USE_AURA ifdefs from views

ui/views/widget/widget_unittest.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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 290 matching lines @@
 // A bag of state to monitor destructions.
 struct OwnershipTestState {
   OwnershipTestState() : widget_deleted(false), native_widget_deleted(false) {}
 
   bool widget_deleted;
   bool native_widget_deleted;
 };
 
 // A platform NativeWidget subclass that updates a bag of state when it is
 // destroyed.
-class OwnershipTestNativeWidget : public NativeWidgetPlatform {
+class OwnershipTestNativeWidget : public NativeWidgetAura {
  public:
   OwnershipTestNativeWidget(internal::NativeWidgetDelegate* delegate,
                             OwnershipTestState* state)
-      : NativeWidgetPlatform(delegate),
+      : NativeWidgetAura(delegate),
         state_(state) {
   }
   virtual ~OwnershipTestNativeWidget() {
     state_->native_widget_deleted = true;
   }
 
  private:
   OwnershipTestState* state_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnershipTestNativeWidget);
 };
 
 // A views NativeWidget subclass that updates a bag of state when it is
 // destroyed.
-class OwnershipTestNativeWidgetPlatform : public NativeWidgetPlatformForTest {
+class OwnershipTestNativeWidgetAura : public NativeWidgetCapture {
  public:
-  OwnershipTestNativeWidgetPlatform(internal::NativeWidgetDelegate* delegate,
-                                    OwnershipTestState* state)
-      : NativeWidgetPlatformForTest(delegate),
+  OwnershipTestNativeWidgetAura(internal::NativeWidgetDelegate* delegate,
+                                OwnershipTestState* state)
+      : NativeWidgetCapture(delegate),
         state_(state) {
   }
-  virtual ~OwnershipTestNativeWidgetPlatform() {
+  virtual ~OwnershipTestNativeWidgetAura() {
     state_->native_widget_deleted = true;
   }
 
  private:
   OwnershipTestState* state_;
 
-  DISALLOW_COPY_AND_ASSIGN(OwnershipTestNativeWidgetPlatform);
+  DISALLOW_COPY_AND_ASSIGN(OwnershipTestNativeWidgetAura);
 };
 
 // A Widget subclass that updates a bag of state when it is destroyed.
 class OwnershipTestWidget : public Widget {
  public:
   explicit OwnershipTestWidget(OwnershipTestState* state) : state_(state) {}
   virtual ~OwnershipTestWidget() {
     state_->widget_deleted = true;
   }
 
  private:
   OwnershipTestState* state_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnershipTestWidget);
 };
 
 // Widget owns its NativeWidget, part 1: NativeWidget is a platform-native
 // widget.
 TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsPlatformNativeWidget) {
   OwnershipTestState state;
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now delete the Widget, which should delete the NativeWidget.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 
   // TODO(beng): write test for this ownership scenario and the NativeWidget
   //             being deleted out from under the Widget.
 }
 
 // Widget owns its NativeWidget, part 2: NativeWidget is a NativeWidget.
 TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsViewsNativeWidget) {
   OwnershipTestState state;
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now delete the Widget, which should delete the NativeWidget.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 
   // TODO(beng): write test for this ownership scenario and the NativeWidget
   //             being deleted out from under the Widget.
 }
 
 // Widget owns its NativeWidget, part 3: NativeWidget is a NativeWidget,
 // destroy the parent view.
 TEST_F(WidgetOwnershipTest,
        Ownership_WidgetOwnsViewsNativeWidget_DestroyParentView) {
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.parent = toplevel->GetNativeView();
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now close the toplevel, which deletes the view hierarchy.
   toplevel->CloseNow();
 
   RunPendingMessages();
 
   // This shouldn't delete the widget because it shouldn't be deleted
   // from the native side.
   EXPECT_FALSE(state.widget_deleted);
   EXPECT_FALSE(state.native_widget_deleted);
 
   // Now delete it explicitly.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // NativeWidget owns its Widget, part 1: NativeWidget is a platform-native
 // widget.
 TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) {
   OwnershipTestState state;
 
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   widget->Init(params);
 
   // Now destroy the native widget.
   widget->CloseNow();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget.
 TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
   // Now destroy the native widget. This is achieved by closing the toplevel.
   toplevel->CloseNow();
 
   // The NativeWidget won't be deleted until after a return to the message loop
   // so we have to run pending messages before testing the destruction status.
   RunPendingMessages();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // NativeWidget owns its Widget, part 3: NativeWidget is a platform-native
 // widget, destroyed out from under it by the OS.
 TEST_F(WidgetOwnershipTest,
        Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) {
   OwnershipTestState state;
 
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   widget->Init(params);
 
   // Now simulate a destroy of the platform native widget from the OS:
-#if defined(USE_AURA)
   delete widget->GetNativeView();
-#elif defined(OS_WIN)
-  DestroyWindow(widget->GetNativeView());
-#endif
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget,
 // destroyed by the view hierarchy that contains it.
 TEST_F(WidgetOwnershipTest,
        Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) {
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
   // Destroy the widget (achieved by closing the toplevel).
   toplevel->CloseNow();
 
   // The NativeWidget won't be deleted until after a return to the message loop
   // so we have to run pending messages before testing the destruction status.
   RunPendingMessages();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // NativeWidget owns its Widget, part 5: NativeWidget is a NativeWidget,
 // we close it directly.
 TEST_F(WidgetOwnershipTest,
        Ownership_ViewsNativeWidgetOwnsWidget_Close) {
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
   // Destroy the widget.
   widget->Close();
   toplevel->CloseNow();
 
   // The NativeWidget won't be deleted until after a return to the message loop
   // so we have to run pending messages before testing the destruction status.
   RunPendingMessages();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
 // Widget owns its NativeWidget and has a WidgetDelegateView as its contents.
 TEST_F(WidgetOwnershipTest,
        Ownership_WidgetOwnsNativeWidgetWithWithWidgetDelegateView) {
   OwnershipTestState state;
 
   WidgetDelegateView* delegate_view = new WidgetDelegateView;
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = delegate_view;
   widget->Init(params);
   widget->SetContentsView(delegate_view);
 
   // Now delete the Widget. There should be no crash or use-after-free.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
@@ skipping 64 matching lines @@
   {
     Widget widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget.Init(params);
     widget.Show();
 
     widget.native_widget_private()->CloseNow();
     InvokeWidgetMethods(&widget);
   }
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   {
     Widget widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.native_widget = new DesktopNativeWidgetAura(&widget);
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget.Init(params);
     widget.Show();
 
     widget.native_widget_private()->CloseNow();
     InvokeWidgetMethods(&widget);
@@ skipping 163 matching lines @@
   child2->OnNativeWidgetMove();
   EXPECT_EQ(child2, widget_bounds_changed());
 
   child1->OnNativeWidgetSizeChanged(gfx::Size());
   EXPECT_EQ(child1, widget_bounds_changed());
 
   child2->OnNativeWidgetSizeChanged(gfx::Size());
   EXPECT_EQ(child2, widget_bounds_changed());
 }
 
-#if !defined(USE_AURA) && defined(OS_WIN)
-// Aura needs shell to maximize/fullscreen window.
-// NativeWidgetGtk doesn't implement GetRestoredBounds.
-TEST_F(WidgetTest, GetRestoredBounds) {

[msw, 2014/03/08 01:04:50]

nit: ditto about updating this test.

[sky, 2014/03/08 01:30:28]

Done.

-  Widget* toplevel = CreateTopLevelPlatformWidget();
-  EXPECT_EQ(toplevel->GetWindowBoundsInScreen().ToString(),
-            toplevel->GetRestoredBounds().ToString());
-  toplevel->Show();
-  toplevel->Maximize();
-  RunPendingMessages();
-  EXPECT_NE(toplevel->GetWindowBoundsInScreen().ToString(),
-            toplevel->GetRestoredBounds().ToString());
-  EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
-  EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
-
-  toplevel->Restore();
-  RunPendingMessages();
-  EXPECT_EQ(toplevel->GetWindowBoundsInScreen().ToString(),
-            toplevel->GetRestoredBounds().ToString());
-
-  toplevel->SetFullscreen(true);
-  RunPendingMessages();
-  EXPECT_NE(toplevel->GetWindowBoundsInScreen().ToString(),
-            toplevel->GetRestoredBounds().ToString());
-  EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
-  EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
-}
-#endif
-
 // Test that window state is not changed after getting out of full screen.
 TEST_F(WidgetTest, ExitFullscreenRestoreState) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   toplevel->Show();
   RunPendingMessages();
 
   // This should be a normal state window.
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, GetWidgetShowState(toplevel));
 
@@ skipping 20 matching lines @@
     RunPendingMessages();
 
   // And it stays maximized after getting out of full screen.
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, GetWidgetShowState(toplevel));
 
   // Clean up.
   toplevel->Close();
   RunPendingMessages();
 }
 
-#if defined(USE_AURA)
 // The key-event propagation from Widget happens differently on aura and
 // non-aura systems because of the difference in IME. So this test works only on
 // aura.
 TEST_F(WidgetTest, KeyboardInputEvent) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
   View* container = toplevel->client_view();
 
   Textfield* textfield = new Textfield();
   textfield->SetText(base::ASCIIToUTF16("some text"));
   container->AddChildView(textfield);
@@ skipping 468 matching lines @@
                           0, 20,
                           2);
   widget->OnScrollEvent(&scroll2);
 
   EXPECT_EQ(0, cursor_view->GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(0, cursor_view->GetEventCount(ui::ET_MOUSEWHEEL));
 
   widget->CloseNow();
 }
 
-#endif  // defined(USE_AURA)
-
 // Tests that if a scroll-begin gesture is not handled, then subsequent scroll
 // events are not dispatched to any view.
 TEST_F(WidgetTest, GestureScrollEventDispatching) {
   EventCountView* noscroll_view = new EventCountView;
   EventCountView* scroll_view = new ScrollableEventCountView;
 
   noscroll_view->SetBounds(0, 0, 50, 40);
   scroll_view->SetBounds(60, 0, 40, 40);
 
   Widget* widget = CreateTopLevelPlatformWidget();
@@ skipping 169 matching lines @@
 
 // Verifies WindowClosing() is invoked correctly on the delegate when a Widget
 // is closed.
 TEST_F(WidgetTest, SingleWindowClosing) {
   scoped_ptr<ClosingDelegate> delegate(new ClosingDelegate());
   Widget* widget = new Widget();  // Destroyed by CloseNow() below.
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   init_params.bounds = gfx::Rect(0, 0, 200, 200);
   init_params.delegate = delegate.get();
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   init_params.native_widget = new DesktopNativeWidgetAura(widget);
 #endif
   widget->Init(init_params);
   EXPECT_EQ(0, delegate->count());
   widget->CloseNow();
   EXPECT_EQ(1, delegate->count());
 }
 
 class WidgetWindowTitleTest : public WidgetTest {
  protected:
   void RunTest(bool desktop_native_widget) {
     Widget* widget = new Widget();  // Destroyed by CloseNow() below.
     Widget::InitParams init_params =
         CreateParams(Widget::InitParams::TYPE_WINDOW);
     widget->Init(init_params);
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (desktop_native_widget)
       init_params.native_widget = new DesktopNativeWidgetAura(widget);
 #else
     DCHECK(!desktop_native_widget)
         << "DesktopNativeWidget does not exist on non-Aura or on ChromeOS.";
 #endif
 
     internal::NativeWidgetPrivate* native_widget =
         widget->native_widget_private();
 
@@ skipping 20 matching lines @@
   }
 };
 
 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_NativeWidget) {
   // Use the default NativeWidget.
   bool desktop_native_widget = false;
   RunTest(desktop_native_widget);
 }
 
 // DesktopNativeWidget does not exist on non-Aura or on ChromeOS.
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
   // Override to use a DesktopNativeWidget.
   bool desktop_native_widget = true;
   RunTest(desktop_native_widget);
 }
-#endif  // USE_AURA && !OS_CHROMEOS
+#endif  // !OS_CHROMEOS
 
 // Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
 class VerifyTopLevelDelegate : public TestViewsDelegate {
  public:
   VerifyTopLevelDelegate()
       : on_before_init_called_(false),
         is_top_level_(false) {
   }
 
   bool on_before_init_called() const { return on_before_init_called_; }
@@ skipping 93 matching lines @@
 // true indicates this should be run again with a value of false.
 // First run uses DesktopNativeWidgetAura (if possible). Second run doesn't.
 bool RunGetNativeThemeFromDestructor(const Widget::InitParams& in_params,
                                      bool is_first_run) {
   bool needs_second_run = false;
   // Destroyed by CloseNow() below.
   Widget* widget = new Widget;
   Widget::InitParams params(in_params);
   // Deletes itself when the Widget is destroyed.
   params.delegate = new GetNativeThemeFromDestructorView;
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   if (is_first_run) {
     params.native_widget = new DesktopNativeWidgetAura(widget);
     needs_second_run = true;
   }
 #endif
   widget->Init(params);
   widget->CloseNow();
   return needs_second_run;
 }
 
@@ skipping 28 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CloseDestroysWidget);
 };
 
 // Verifies Close() results in destroying.
 TEST_F(WidgetTest, CloseDestroys) {
   bool destroyed = false;
   CloseDestroysWidget* widget = new CloseDestroysWidget(&destroyed);
   Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_MENU);
   params.opacity = Widget::InitParams::OPAQUE_WINDOW;
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   params.native_widget = new DesktopNativeWidgetAura(widget);
 #endif
   widget->Init(params);
   widget->Show();
   widget->Hide();
   widget->Close();
   // Run the message loop as Close() asynchronously deletes.
   RunPendingMessages();
   EXPECT_TRUE(destroyed);
   // Close() should destroy the widget. If not we'll cleanup to avoid leaks.
@@ skipping 137 matching lines @@
   // Creates a top level and a child, destroys the child and verifies the views
   // of the child are destroyed before the views of the parent.
   void RunDestroyChildWidgetsTest(bool top_level_has_desktop_native_widget_aura,
                                   bool child_has_desktop_native_widget_aura) {
     // When a View is destroyed its name is added here.
     std::vector<std::string> destroyed;
 
     Widget* top_level = new Widget;
     Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_WINDOW);
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (top_level_has_desktop_native_widget_aura)
       params.native_widget = new DesktopNativeWidgetAura(top_level);
 #endif
     top_level->Init(params);
     top_level->GetRootView()->AddChildView(
         new DestroyedTrackingView("parent", &destroyed));
     top_level->Show();
 
     Widget* child = new Widget;
     Widget::InitParams child_params =
         CreateParams(views::Widget::InitParams::TYPE_POPUP);
     child_params.parent = top_level->GetNativeView();
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (child_has_desktop_native_widget_aura)
       child_params.native_widget = new DesktopNativeWidgetAura(child);
 #endif
     child->Init(child_params);
     child->GetRootView()->AddChildView(
         new DestroyedTrackingView("child", &destroyed));
     child->Show();
 
     // Should trigger destruction of the child too.
     top_level->native_widget_private()->CloseNow();
 
     // Child should be destroyed first.
     ASSERT_EQ(2u, destroyed.size());
     EXPECT_EQ("child", destroyed[0]);
     EXPECT_EQ("parent", destroyed[1]);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WidgetChildDestructionTest);
 };
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 // See description of RunDestroyChildWidgetsTest(). Parent uses
 // DesktopNativeWidgetAura.
 TEST_F(WidgetChildDestructionTest,
        DestroyChildWidgetsInOrderWithDesktopNativeWidget) {
   RunDestroyChildWidgetsTest(true, false);
 }
 
 // See description of RunDestroyChildWidgetsTest(). Both parent and child use
 // DesktopNativeWidgetAura.
 TEST_F(WidgetChildDestructionTest,
        DestroyChildWidgetsInOrderWithDesktopNativeWidgetForBoth) {
   RunDestroyChildWidgetsTest(true, true);
 }
 #endif
 
 // See description of RunDestroyChildWidgetsTest().
 TEST_F(WidgetChildDestructionTest, DestroyChildWidgetsInOrder) {
   RunDestroyChildWidgetsTest(false, false);
 }
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 // Provides functionality to create a window modal dialog.
 class ModalDialogDelegate : public DialogDelegateView {
  public:
   ModalDialogDelegate() {}
   virtual ~ModalDialogDelegate() {}
 
   // WidgetDelegate overrides.
   virtual ui::ModalType GetModalType() const OVERRIDE {
     return ui::MODAL_TYPE_WINDOW;
   }
@@ skipping 72 matching lines @@
                                  ui::EF_NONE);
   details = top_level_widget.GetNativeView()->GetHost()->dispatcher()->
       OnEventFromSource(&mouse_down_main);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED));
 
   modal_dialog_widget->CloseNow();
   top_level_widget.CloseNow();
 }
 
-#if defined(USE_AURA)
 // Verifies nativeview visbility matches that of Widget visibility when
 // SetFullscreen is invoked.
 TEST_F(WidgetTest, FullscreenStatePropagated) {
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   init_params.show_state = ui::SHOW_STATE_NORMAL;
   init_params.bounds = gfx::Rect(0, 0, 500, 500);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
 
   {
@@ skipping 10 matching lines @@
     Widget top_level_widget;
     init_params.native_widget = new DesktopNativeWidgetAura(&top_level_widget);
     top_level_widget.Init(init_params);
     top_level_widget.SetFullscreen(true);
     EXPECT_EQ(top_level_widget.IsVisible(),
               top_level_widget.GetNativeView()->IsVisible());
     top_level_widget.CloseNow();
   }
 #endif
 }
-#endif
 
 #if defined(OS_WIN)
 
 // Provides functionality to test widget activation via an activation flag
 // which can be set by an accessor.
 class ModalWindowTestWidgetDelegate : public WidgetDelegate {
  public:
   ModalWindowTestWidgetDelegate()
       : widget_(NULL),
         can_activate_(true) {}
@@ skipping 113 matching lines @@
 TEST_F(WidgetTest, ShowAfterShowInactive) {
   Widget* widget = CreateTopLevelPlatformWidget();
 
   widget->ShowInactive();
   widget->Show();
   EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL);
 
   widget->CloseNow();
 }
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 TEST_F(WidgetTest, InactiveWidgetDoesNotGrabActivation) {
   Widget* widget = CreateTopLevelPlatformWidget();
   widget->Show();
   EXPECT_EQ(GetWidgetShowState(widget), ui::SHOW_STATE_NORMAL);
 
   Widget widget2;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.can_activate = false;
   params.native_widget = new DesktopNativeWidgetAura(&widget2);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 109 matching lines @@
   child_widget.Init(child_params);
   child_widget.AddObserver(&observer);
   child_widget.Show();
 
   parent_widget.CloseNow();
 }
 #endif
 
 }  // namespace test
 }  // namespace views