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

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_ASH)
-#include "ui/aura/test/test_screen.h"
-#endif
-
 #if defined(USE_AURA)
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #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_activation_client.h"
+#include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/gfx/screen.h"
 
 namespace {
 
 class DummyInputMethod : public ui::InputMethod {
  public:
   DummyInputMethod() {}
   virtual ~DummyInputMethod() {}
 
   // ui::InputMethod overrides:
   virtual void SetDelegate(
@@ skipping 47 matching lines @@
 }
 
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
   if (!views_delegate_.get())
     views_delegate_.reset(new TestViewsDelegate());
 #if defined(USE_AURA)
   aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
   root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
-#if defined(USE_ASH)
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
-#endif  // USE_ASH
   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  // USE_AURA
 }
 
@@ skipping 14 matching lines @@
 void ViewsTestBase::RunPendingMessages() {
 #if defined(USE_AURA)
   message_loop_.RunAllPendingWithDispatcher(
       aura::Env::GetInstance()->GetDispatcher());
 #else
   message_loop_.RunAllPending();
 #endif
 }
 
 }  // namespace views