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

services/ui/ws/display_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "services/ui/common/types.h"
 #include "services/ui/common/util.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/test_utils.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/rect.h"
 
-using display::ViewportMetrics;
-
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
 const UserId kTestId1 = "2";
 const UserId kTestId2 = "21";
 
 ClientWindowId ClientWindowIdForFirstRoot(WindowTree* tree) {
   if (tree->roots().empty())
@@ skipping 73 matching lines @@
  private:
   WindowServerTestHelper ws_test_helper_;
   TestScreenManager screen_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayTest);
 };
 
 TEST_F(DisplayTest, CreateDisplay) {
   AddWindowManager(window_server(), kTestId1);
   const int64_t display_id =
-      screen_manager().AddDisplay(MakeViewportMetrics(0, 0, 1024, 768, 1.0f));
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
 
   ASSERT_EQ(1u, display_manager()->displays().size());
   Display* display = display_manager()->GetDisplayById(display_id);
 
   // Display should have root window with correct size.
   ASSERT_NE(nullptr, display->root_window());
   EXPECT_EQ("0,0 1024x768", display->root_window()->bounds().ToString());
 
   // Display should have a WM root window with the correct size too.
   EXPECT_EQ(1u, display->num_window_manager_states());
   WindowManagerDisplayRoot* root1 =
       display->GetWindowManagerDisplayRootForUser(kTestId1);
   ASSERT_NE(nullptr, root1);
   ASSERT_NE(nullptr, root1->root());
   EXPECT_EQ("0,0 1024x768", root1->root()->bounds().ToString());
 }
 
 TEST_F(DisplayTest, CreateDisplayBeforeWM) {
   // Add one display, no WM exists yet.
   const int64_t display_id =
-      screen_manager().AddDisplay(MakeViewportMetrics(0, 0, 1024, 768, 1.0f));
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
   EXPECT_EQ(1u, display_manager()->displays().size());
 
   Display* display = display_manager()->GetDisplayById(display_id);
 
   // Display should have root window with correct size.
   ASSERT_NE(nullptr, display->root_window());
   EXPECT_EQ("0,0 1024x768", display->root_window()->bounds().ToString());
 
   // There should be no WM state for display yet.
   EXPECT_EQ(0u, display->num_window_manager_states());
@@ skipping 32 matching lines @@
   ASSERT_NE(nullptr, root2);
 
   // Verify the two WMs have different roots but with the same bounds.
   EXPECT_NE(root1, root2);
   EXPECT_NE(root1->root(), root2->root());
   EXPECT_EQ(root1->root()->bounds(), root2->root()->bounds());
 }
 
 TEST_F(DisplayTest, CreateDisplayWithDeviceScaleFactor) {
   // The display bounds should be the pixel_size / device_scale_factor.
-  const ViewportMetrics metrics = MakeViewportMetrics(0, 0, 1024, 768, 2.0f);
-  EXPECT_EQ("0,0 512x384", metrics.bounds.ToString());
-  EXPECT_EQ("1024x768", metrics.pixel_size.ToString());
+  display::Display display = MakeDisplay(0, 0, 1024, 768, 2.0f);
+  EXPECT_EQ("0,0 512x384", display.bounds().ToString());
 
-  const int64_t display_id = screen_manager().AddDisplay(metrics);
-  Display* display = display_manager()->GetDisplayById(display_id);
+  const int64_t display_id = screen_manager().AddDisplay(display);
+  display.set_id(display_id);
+  Display* ws_display = display_manager()->GetDisplayById(display_id);
 
   // The root ServerWindow bounds should be in PP.
-  EXPECT_EQ("0,0 1024x768", display->root_window()->bounds().ToString());
+  EXPECT_EQ("0,0 1024x768", ws_display->root_window()->bounds().ToString());
 
-  ViewportMetrics modified_metrics = metrics;
-  modified_metrics.work_area.set_height(metrics.work_area.height() - 48);
-  screen_manager().ModifyDisplay(display_id, modified_metrics);
+  // Modify the display work area to be 48 DIPs smaller.
+  display::Display modified_display = display;
+  gfx::Rect modified_work_area = display.work_area();
+  modified_work_area.set_height(modified_work_area.height() - 48);
+  modified_display.set_work_area(modified_work_area);
+  screen_manager().ModifyDisplay(modified_display);
+
+  // The display work area should have changed.
+  EXPECT_EQ("0,0 512x336", ws_display->GetDisplay().work_area().ToString());
 
   // The root ServerWindow should still be in PP after updating the work area.
-  EXPECT_EQ("0,0 1024x768", display->root_window()->bounds().ToString());
+  EXPECT_EQ("0,0 1024x768", ws_display->root_window()->bounds().ToString());
 }
 
 TEST_F(DisplayTest, Destruction) {
   AddWindowManager(window_server(), kTestId1);
 
   int64_t display_id = screen_manager().AddDisplay();
 
   // Add a second WM.
   AddWindowManager(window_server(), kTestId2);
   ASSERT_EQ(1u, display_manager()->displays().size());
@@ skipping 191 matching lines @@
   ASSERT_EQ(0u, tree_client->tracker()->changes()->size());
 
   // The window should be destroyed when the client says so.
   ASSERT_TRUE(tree->DeleteWindow(secondary_root_id));
   EXPECT_TRUE(secondary_root_destroyed);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui