Start to decouple display::Display from ws::PlatformDisplay.

services/ui/display/viewport_metrics.cc

Index: services/ui/display/viewport_metrics.cc
diff --git a/services/ui/display/viewport_metrics.cc b/services/ui/display/viewport_metrics.cc
index 0cbacae06bb9bf991788f11a3f3a06319d44c888..cdf95482d4bb9735d90ba0f73f3fe4f0630fe8f8 100644
--- a/services/ui/display/viewport_metrics.cc
+++ b/services/ui/display/viewport_metrics.cc
@@ -8,46 +8,11 @@
 
 namespace display {
 
-namespace {
-
-std::string TouchSupportString(Display::TouchSupport touch_support) {
-  switch (touch_support) {
-    case Display::TOUCH_SUPPORT_UNKNOWN:
-      return "unknown";
-    case Display::TOUCH_SUPPORT_AVAILABLE:
-      return "available";
-    case Display::TOUCH_SUPPORT_UNAVAILABLE:
-      return "unavailable";
-  }
-  NOTREACHED();
-  return "Invalid TouchSupport";
-}
-
-std::string RotationString(Display::Rotation rotation) {
-  switch (rotation) {
-    case Display::ROTATE_0:
-      return "0";
-    case Display::ROTATE_90:
-      return "90";
-    case Display::ROTATE_180:
-      return "180";
-    case Display::ROTATE_270:
-      return "270";
-  }
-  NOTREACHED();
-  return "Invalid Rotation";
-}
-
-}  // namespace
-
 std::string ViewportMetrics::ToString() const {
   return base::StringPrintf(
-      "ViewportMetrics(bounds=%s, work_area=%s, pixel_size=%s, "
-      "rotation=%s, touch_support=%s, "
-      "device_scale_factor=%g, ui_scale_factor=%g)",
-      bounds.ToString().c_str(), work_area.ToString().c_str(),
-      pixel_size.ToString().c_str(), RotationString(rotation).c_str(),
-      TouchSupportString(touch_support).c_str(), device_scale_factor,
+      "ViewportMetrics(bounds_in_pixels=%s, device_scale_factor=%g, "
+      "ui_scale_factor=%g)",
+      bounds_in_pixels.ToString().c_str(), device_scale_factor,
       ui_scale_factor);
 }