MultiMonitor support

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"
 #include "chrome/browser/ui/views/accessibility_event_router_views.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #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/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 
 class AccessibilityViewsDelegate : public views::ViewsDelegate {
  public:
@@ skipping 81 matching lines @@
   ui::AccessibilityTypes::Role role_;
 };
 
 class AccessibilityEventRouterViewsTest
     : public testing::Test,
       public content::NotificationObserver {
  public:
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
-    root_window_.reset(aura::Env::GetInstance()->monitor_manager()->
-                       CreateRootWindowForPrimaryMonitor());
+    root_window_.reset(
+        aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
     gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
     test_stacking_client_.reset(
         new aura::test::TestStackingClient(root_window_.get()));
 #endif
   }
 
   virtual void TearDown() {
 #if defined(USE_AURA)
     test_stacking_client_.reset();
     root_window_.reset();
@@ skipping 180 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)