Revert of ScreenWin Testability and Restructuring

ui/gfx/display.h

Index: ui/gfx/display.h
diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index a3bb0a846dcd19412e52801347adf4809c4e44e1..6076e490a7ef6b76e364dc3f9716d09c80f147fe 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -154,11 +154,6 @@
   TouchSupport touch_support_;
 };
 
-// This is declared here for use in gtest-based unit tests but is defined in
-// the gfx_test_support target. Depend on that to use this in your unit test.
-// This should not be used in production code - call ToString() instead.
-void PrintTo(const Display& display, ::std::ostream* os);
-
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_