Remove unnecessary uses of aura::Env::GetDispatcher

ui/views/bubble/bubble_delegate_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 "base/run_loop.h"
+#include "ui/aura/env.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/env.h"
-#endif
-
 namespace views {
 
 namespace {
 
 class TestBubbleDelegateView : public BubbleDelegateView {
  public:
   TestBubbleDelegateView(View* anchor_view)
       : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
         view_(new View()) {
     view_->SetFocusable(true);
@@ skipping 70 matching lines @@
   EXPECT_EQ(bubble_delegate, bubble_widget->widget_delegate());
   EXPECT_EQ(bubble_widget, bubble_delegate->GetWidget());
   EXPECT_EQ(anchor_widget, bubble_delegate->anchor_widget());
   test::TestWidgetObserver bubble_observer(bubble_widget);
   EXPECT_FALSE(bubble_observer.widget_closed());
 
   bubble_widget->Show();
   EXPECT_EQ(anchor_widget, bubble_delegate->anchor_widget());
   EXPECT_FALSE(bubble_observer.widget_closed());
 
-#if defined(USE_AURA)
   // TODO(msw): Remove activation hack to prevent bookkeeping errors in:
   //            aura::test::TestActivationClient::OnWindowDestroyed().
   scoped_ptr<Widget> smoke_and_mirrors_widget(CreateTestWidget());
   EXPECT_FALSE(bubble_observer.widget_closed());
-#endif
 
   // Ensure that closing the anchor widget also closes the bubble itself.
   anchor_widget->CloseNow();
   EXPECT_TRUE(bubble_observer.widget_closed());
 }
 
 // This test checks that the bubble delegate is capable to handle an early
 // destruction of the used anchor view. (Animations and delayed closure of the
 // bubble will call upon the anchor view to get its location).
 TEST_F(BubbleDelegateTest, CloseAnchorViewTest) {
@@ skipping 67 matching lines @@
   EXPECT_EQ(anchor_widget, bubble_delegate->anchor_widget());
   bubble_widget->Hide();
   EXPECT_EQ(anchor_widget, bubble_delegate->anchor_widget());
 
   // Ensure that closing the anchor widget clears the bubble's reference to that
   // anchor widget, but the bubble itself does not close.
   anchor_widget->CloseNow();
   EXPECT_NE(anchor_widget, bubble_delegate->anchor_widget());
   EXPECT_FALSE(bubble_observer.widget_closed());
 
-#if defined(USE_AURA)
   // TODO(msw): Remove activation hack to prevent bookkeeping errors in:
   //            aura::test::TestActivationClient::OnWindowDestroyed().
   scoped_ptr<Widget> smoke_and_mirrors_widget(CreateTestWidget());
   EXPECT_FALSE(bubble_observer.widget_closed());
-#endif
 
   // Ensure that closing the parent widget also closes the bubble itself.
   parent_widget->CloseNow();
   EXPECT_TRUE(bubble_observer.widget_closed());
 }
 
 TEST_F(BubbleDelegateTest, InitiallyFocusedView) {
   scoped_ptr<Widget> anchor_widget(CreateTestWidget());
   BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
       anchor_widget->GetContentsView(), BubbleBorder::NONE);
@@ skipping 41 matching lines @@
   EXPECT_FALSE(bubble_widget->IsVisible());
 }
 
 // This class provides functionality to verify that the BubbleView shows up
 // when we call BubbleDelegateView::StartFade(true) and is destroyed when we
 // call BubbleDelegateView::StartFade(false).
 class BubbleWidgetClosingTest : public BubbleDelegateTest,
                                 public views::WidgetObserver {
  public:
   BubbleWidgetClosingTest() : bubble_destroyed_(false) {
-#if defined(USE_AURA)
     aura::Env::CreateInstance();
-    loop_.set_dispatcher(aura::Env::GetInstance()->GetDispatcher());
-#endif
   }
 
   virtual ~BubbleWidgetClosingTest() {}
 
   void Observe(views::Widget* widget) {
     widget->AddObserver(this);
   }
 
   // views::WidgetObserver overrides.
   virtual void OnWidgetDestroyed(Widget* widget) OVERRIDE {
@@ skipping 29 matching lines @@
             bubble_widget->GetFocusManager()->GetFocusedView());
 
   Observe(bubble_widget);
 
   bubble_delegate->StartFade(false);
   RunNestedLoop();
   EXPECT_TRUE(bubble_destroyed());
 }
 
 }  // namespace views