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

chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "base/macros.h"
@@ skipping 154 matching lines @@
   }
 
   EXPECT_EQ(cursor1_bounds.x() - cursor2_bounds.x(),
             mi1_bounds.x() - mi2_bounds.x());
   EXPECT_EQ(cursor1_bounds.y() - cursor2_bounds.y(),
             mi1_bounds.y() - mi2_bounds.y());
   EXPECT_EQ(mi1_bounds.width(),  mi2_bounds.width());
   EXPECT_EQ(mi1_bounds.height(), mi2_bounds.height());
 
   const gfx::Rect screen_bounds =
-      ash::Shell::GetScreen()->GetDisplayMatching(cursor1_bounds).work_area();
+      gfx::Screen::GetScreen()->GetDisplayMatching(cursor1_bounds).work_area();
 
   // Check if the location of the mode indicator is concidered with
   // the screen size.
   const gfx::Rect cursor3_bounds(100, screen_bounds.bottom() - 25, 1, 20);
   gfx::Rect mi3_bounds;
   {
     ScopedModeIndicatorObserverForTesting observer;
     candidate_window->SetCursorBounds(cursor3_bounds, cursor3_bounds);
     imm->GetActiveIMEState()->SwitchToNextInputMethod();
     mi3_bounds = observer.last_bounds();
@@ skipping 34 matching lines @@
     // When a new mode indicator is displayed, the previous one should be
     // closed.
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(1UL, observer.widget_list_size());
     const views::Widget* widget2 = observer.widget_list()[0];
     EXPECT_NE(widget1, widget2);
   }
 }
 }  // namespace input_method
 }  // namespace chromeos