Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

 // Copyright 2014 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 "ash/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/display/display_manager.h"
@@ skipping 42 matching lines @@
     BOTTOM_RIGHT,
     OUTSIDE
   };
 
   AshPopupAlignmentDelegate* alignment_delegate() {
     return alignment_delegate_.get();
   }
 
   void UpdateWorkArea(AshPopupAlignmentDelegate* alignment_delegate,
                       const gfx::Display& display) {
-    alignment_delegate->StartObserving(Shell::GetScreen(), display);
+    alignment_delegate->StartObserving(gfx::Screen::GetScreen(), display);
     // Update the layout
     alignment_delegate->OnDisplayWorkAreaInsetsChanged();
   }
 
   void SetAlignmentDelegate(scoped_ptr<AshPopupAlignmentDelegate> delegate) {
     if (!delegate.get()) {
       alignment_delegate_.reset();
       return;
     }
     alignment_delegate_ = std::move(delegate);
     UpdateWorkArea(alignment_delegate_.get(),
-                   Shell::GetScreen()->GetPrimaryDisplay());
+                   gfx::Screen::GetScreen()->GetPrimaryDisplay());
   }
 
   Position GetPositionInDisplay(const gfx::Point& point) {
     const gfx::Rect& work_area =
-        Shell::GetScreen()->GetPrimaryDisplay().work_area();
+        gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
     const gfx::Point center_point = work_area.CenterPoint();
     if (work_area.x() > point.x() || work_area.y() > point.y() ||
         work_area.right() < point.x() || work_area.bottom() < point.y()) {
       return OUTSIDE;
     }
 
     if (center_point.x() < point.x())
       return (center_point.y() < point.y()) ? BOTTOM_RIGHT : TOP_RIGHT;
     else
       return (center_point.y() < point.y()) ? BOTTOM_LEFT : TOP_LEFT;
@@ skipping 215 matching lines @@
   SetKeyboardBounds(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   SetKeyboardBounds(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash