MultiMonitor support

ui/views/test/views_test_base.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 "ui/views/test/views_test_base.h"
 
 #if defined(USE_AURA)
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
@@ skipping 61 matching lines @@
   CHECK(teardown_called_)
       << "You have overrideen TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 #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()));
   root_window_->SetProperty(
       aura::client::kRootWindowInputMethodKey,
       test_input_method_.get());
   test_activation_client_.reset(
       new aura::test::TestActivationClient(root_window_.get()));
   test_stacking_client_.reset(
       new aura::test::TestStackingClient(root_window_.get()));
 #endif
 }
@@ skipping 15 matching lines @@
 void ViewsTestBase::RunPendingMessages() {
 #if defined(USE_AURA)
   message_loop_.RunAllPendingWithDispatcher(
       aura::Env::GetInstance()->GetDispatcher());
 #else
   message_loop_.RunAllPending();
 #endif
 }
 
 }  // namespace views