Revert of ScreenWin Testability and Restructuring

ui/gfx/test/gfx_util.cc

Index: ui/gfx/test/gfx_util.cc
diff --git a/ui/gfx/test/gfx_util.cc b/ui/gfx/test/gfx_util.cc
index e2157fe61b76eda18cdee20f26d8cc3a261a05d6..d8bf5f2af942e8b3eb54db125d47f78e8a39639e 100644
--- a/ui/gfx/test/gfx_util.cc
+++ b/ui/gfx/test/gfx_util.cc
@@ -8,7 +8,6 @@
 #include <sstream>
 #include <string>
 
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ -96,10 +95,6 @@
   *os << box.ToString();
 }
 
-void PrintTo(const Display& display, ::std::ostream* os) {
-  *os << display.ToString();
-}
-
 void PrintTo(const Point& point, ::std::ostream* os) {
   *os << point.ToString();
 }