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

ui/views/widget/native_widget_aura_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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.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/aura/window.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget_delegate.h"
 
-#if defined(USE_ASH)
-#include "ui/aura/test/test_screen.h"
-#endif
-
 namespace views {
 namespace {
 
 NativeWidgetAura* Init(aura::Window* parent, Widget* widget) {
   Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = parent;
   widget->Init(params);
   return static_cast<NativeWidgetAura*>(widget->native_widget());
 }
 
 class NativeWidgetAuraTest : public testing::Test {
  public:
   NativeWidgetAuraTest() {}
   virtual ~NativeWidgetAuraTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     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
     root_window_->SetBounds(gfx::Rect(0, 0, 640, 480));
     root_window_->SetHostSize(gfx::Size(640, 480));
     test_stacking_client_.reset(
         new aura::test::TestStackingClient(root_window_.get()));
   }
   virtual void TearDown() OVERRIDE {
     message_loop_.RunAllPending();
     test_stacking_client_.reset();
     root_window_.reset();
   }
@@ skipping 124 matching lines @@
   // For Aura, client area bounds match window bounds.
   gfx::Rect client_bounds = widget->GetClientAreaScreenBounds();
   EXPECT_EQ(10, client_bounds.x());
   EXPECT_EQ(20, client_bounds.y());
   EXPECT_EQ(300, client_bounds.width());
   EXPECT_EQ(400, client_bounds.height());
 }
 
 }  // namespace
 }  // namespace views