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

services/ui/display/screen_manager_ozone_internal_unittests.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 <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 17 matching lines @@
 
 namespace display {
 
 using testing::IsEmpty;
 using testing::SizeIs;
 
 namespace {
 
 // Holds info about the display state we want to test.
 struct DisplayState {
-  int64_t id;
+  Display display;
   ViewportMetrics metrics;
 };
 
 // Matchers that operate on DisplayState.
 MATCHER_P(DisplayIdIs, display_id, "") {
-  *result_listener << "has id " << arg.id;
-  return arg.id == display_id;
+  *result_listener << "has id " << arg.display.id();
+  return arg.display.id() == display_id;
 }
 
 MATCHER_P(DisplayPixelSizeIs, size_string, "") {
-  *result_listener << "has size " << arg.metrics.pixel_size.ToString();
-  return arg.metrics.pixel_size.ToString() == size_string;
+  *result_listener << "has size "
+                   << arg.metrics.bounds_in_pixels.size().ToString();
+  return arg.metrics.bounds_in_pixels.size().ToString() == size_string;
 }
 
 MATCHER_P(DisplayBoundsIs, bounds_string, "") {
-  *result_listener << "has size " << arg.metrics.bounds.ToString();
-  return arg.metrics.bounds.ToString() == bounds_string;
+  *result_listener << "has size " << arg.display.bounds().ToString();
+  return arg.display.bounds().ToString() == bounds_string;
 }
 
 // Test delegate to track what functions calls the delegate receives.
 class TestScreenManagerDelegate : public ScreenManagerDelegate {
  public:
   TestScreenManagerDelegate() {}
   ~TestScreenManagerDelegate() override {}
 
   const std::vector<DisplayState>& added() const { return added_; }
   const std::vector<DisplayState>& modified() const { return modified_; }
@@ skipping 11 matching lines @@
     changes_.clear();
   }
 
  private:
   void AddChange(const std::string& name, const std::string& value) {
     if (!changes_.empty())
       changes_ += ";";
     changes_ += name + "(" + value + ")";
   }
 
-  void OnDisplayAdded(int64_t id, const ViewportMetrics& metrics) override {
-    added_.push_back({id, metrics});
-    AddChange("Added", base::Int64ToString(id));
+  void OnDisplayAdded(const display::Display& display,
+                      const ViewportMetrics& metrics) override {
+    added_.push_back({display, metrics});
+    AddChange("Added", base::Int64ToString(display.id()));
   }
 
   void OnDisplayRemoved(int64_t id) override {
     AddChange("Removed", base::Int64ToString(id));
   }
 
-  void OnDisplayModified(int64_t id, const ViewportMetrics& metrics) override {
-    modified_.push_back({id, metrics});
-    AddChange("Modified", base::Int64ToString(id));
+  void OnDisplayModified(const display::Display& display,
+                         const ViewportMetrics& metrics) override {
+    modified_.push_back({display, metrics});
+    AddChange("Modified", base::Int64ToString(display.id()));
   }
 
   void OnPrimaryDisplayChanged(int64_t primary_display_id) override {
     AddChange("Primary", base::Int64ToString(primary_display_id));
   }
 
   std::vector<DisplayState> added_;
   std::vector<DisplayState> modified_;
   std::string changes_;
 
@@ skipping 167 matching lines @@
 
   // Swapping again should be similar and end up back with display 1 as primary.
   screen_manager()->SwapPrimaryDisplay();
   EXPECT_EQ("Modified(1);Modified(2);Primary(1)", delegate()->changes());
   EXPECT_THAT(delegate()->modified()[0], DisplayBoundsIs("0,0 1024x768"));
   EXPECT_THAT(delegate()->modified()[1], DisplayBoundsIs("1024,0 1024x768"));
   EXPECT_EQ(1, Screen::GetScreen()->GetPrimaryDisplay().id());
 }
 
 }  // namespace display