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

ui/aura/test/aura_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/aura/test/aura_test_base.h"
 
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/single_monitor_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/base/gestures/gesture_configuration.h"
+#include "ui/gfx/screen.h"
 #include "ui/ui_controls/ui_controls.h"
 
 namespace aura {
 namespace test {
 
 AuraTestBase::AuraTestBase() {
 }
 
 AuraTestBase::~AuraTestBase() {
 }
@@ skipping 42 matching lines @@
   root_window_.reset();
   testing::Test::TearDown();
 }
 
 void AuraTestBase::RunAllPendingInMessageLoop() {
   helper_.RunAllPendingInMessageLoop(root_window());
 }
 
 }  // namespace test
 }  // namespace aura