Refactor screen/monitor so that gfx::Screen returns monitor object.

chrome/browser/ui/views/accessibility_event_router_views_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 <string>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 13 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
+#include "ui/gfx/screen.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 
 class AccessibilityViewsDelegate : public views::ViewsDelegate {
  public:
   AccessibilityViewsDelegate() {}
   virtual ~AccessibilityViewsDelegate() {}
 
   // Overridden from views::ViewsDelegate:
@@ skipping 87 matching lines @@
 class AccessibilityEventRouterViewsTest
     : public testing::Test,
       public content::NotificationObserver {
  public:
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
     aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
     root_window_.reset(
         aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
-#if defined(USE_ASH)
+#if defined(USE_AURA)
     gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
 #endif  // USE_ASH
     test_stacking_client_.reset(
         new aura::test::TestStackingClient(root_window_.get()));
 #endif  // USE_AURA
   }
 
   virtual void TearDown() {
 #if defined(USE_AURA)
     test_stacking_client_.reset();
@@ skipping 181 matching lines @@
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(1, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 #endif  // defined(TOOLKIT_VIEWS)