Nukes USE_AURA ifdefs from views

ui/views/focus/focus_manager_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 <utility>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
+#include "ui/aura/client/focus_client.h"
+#include "ui/aura/window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/client/focus_client.h"
-#include "ui/aura/window.h"
-#endif
-
 namespace views {
 
 void FocusNativeView(gfx::NativeView view) {

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

nit: this could be inlined for its two users.

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

Done.

-#if defined(USE_AURA)
   aura::client::GetFocusClient(view)->FocusWindow(view);
-#elif defined(OS_WIN)
-  SetFocus(view);
-#else
-#error
-#endif
 }
 
 enum FocusTestEventType {
   ON_FOCUS = 0,
   ON_BLUR
 };
 
 struct FocusTestEvent {
   FocusTestEvent(FocusTestEventType type, int view_id)
       : type(type),
@@ skipping 515 matching lines @@
 
   virtual void TearDown() {
     FocusManagerFactory::Install(NULL);
     ViewsTestBase::TearDown();
   }
 
   FocusManager* tracked_focus_manager_;
   DtorTrackVector dtor_tracker_;
 };
 
-#if !defined(USE_AURA)
-TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
-  // Setup views hierarchy.
-  GetContentsView()->AddChildView(new Textfield());
-  GetContentsView()->AddChildView(new LabelButtonDtorTracked(
-      base::ASCIIToUTF16("button"), &dtor_tracker_));
-
-  // Close the window.
-  GetWidget()->Close();
-  RunPendingMessages();
-
-  // Test window, button and focus manager should all be destructed.
-  ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
-
-  // Focus manager should be the last one to destruct.
-  ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
-}
-#endif
-
 namespace {
 
 class FocusInAboutToRequestFocusFromTabTraversalView : public View {
  public:
   FocusInAboutToRequestFocusFromTabTraversalView() : view_to_focus_(NULL) {}
 
   void set_view_to_focus(View* view) { view_to_focus_ = view; }
 
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE {
     view_to_focus_->RequestFocus();
@@ skipping 286 matching lines @@
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Allow focus to go to the parent, and focus backwards which should now move
   // up |widget_view| (in the parent).
   delegate->set_should_advance_focus_to_parent(true);
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views