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

ash/wm/maximize_mode/maximize_mode_window_manager_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/wm/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 84 matching lines @@
   }
 
   // Get the maximze window manager.
   ash::MaximizeModeWindowManager* maximize_mode_window_manager() {
     return Shell::GetInstance()->maximize_mode_controller()->
         maximize_mode_window_manager_.get();
   }
 
   // Resize our desktop.
   void ResizeDesktop(int width_delta) {
-    gfx::Size size = Shell::GetScreen()->GetDisplayNearestWindow(
-        Shell::GetPrimaryRootWindow()).size();
+    gfx::Size size =
+        gfx::Screen::GetScreen()
+            ->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow())
+            .size();
     size.Enlarge(0, width_delta);
     UpdateDisplay(size.ToString());
   }
 
  private:
   // Create a window in one of the containers which are watched by the
   // MaximizeModeWindowManager. Note that this only works with one root window.
   // If |can_maximize| is not set, |max_size| is the upper limiting size for
   // the window, whereas an empty size means that there is no limit.
   aura::Window* CreateWindowInWatchedContainer(ui::wm::WindowType type,
@@ skipping 1294 matching lines @@
 
   ash::MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
   EXPECT_TRUE(wm::GetWindowState(window.get())->IsDocked());
   EXPECT_FALSE(wm::GetWindowState(window.get())->IsMaximized());
   EXPECT_EQ(0, manager->GetNumberOfManagedWindows());
 }
 
 #endif  // OS_WIN
 
 }  // namespace ash