ScreenWin Testability and Restructuring

ui/gfx/test/gfx_util.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 "ui/gfx/test/gfx_util.h"
 
 #include <iomanip>
 #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"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_f.h"
@@ skipping 67 matching lines @@
   return ::testing::AssertionFailure() << "Value of: " << rhs_expr
                                        << "\n  Actual: " << ColorAsString(rhs)
                                        << "\nExpected: " << lhs_expr
                                        << "\nWhich is: " << ColorAsString(lhs);
 }
 
 void PrintTo(const BoxF& box, ::std::ostream* os) {
   *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();
 }
 
 void PrintTo(const Point3F& point, ::std::ostream* os) {
   *os << point.ToString();
 }
 
 void PrintTo(const PointF& point, ::std::ostream* os) {
   *os << point.ToString();
@@ skipping 33 matching lines @@
 
 void PrintTo(const Vector2dF& vector, ::std::ostream* os) {
   *os << vector.ToString();
 }
 
 void PrintTo(const Vector3dF& vector, ::std::ostream* os) {
   *os << vector.ToString();
 }
 
 }  // namespace gfx