Start using display.mojom.Display in mus+ash.

services/ui/ws/user_display_manager_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/atomicops.h"
 #include "base/macros.h"
@@ skipping 37 matching lines @@
   }
 
  private:
   void AddCall(const std::string& call) {
     if (!observer_calls_.empty())
       observer_calls_ += "\n";
     observer_calls_ += call;
   }
 
   std::string DisplayIdsToString(
-      const mojo::Array<mojom::DisplayPtr>& displays) {
+      const mojo::Array<mojom::WmDisplayPtr>& wm_displays) {
     std::string display_ids;
-    for (const auto& display : displays) {
+    for (const auto& wm_display : wm_displays) {
       if (!display_ids.empty())
         display_ids += " ";
-      display_ids += base::Int64ToString(display->id);
+      display_ids += base::Int64ToString(wm_display->display.id());
     }
     return display_ids;
   }
 
   // mojom::DisplayManagerObserver:
-  void OnDisplays(mojo::Array<mojom::DisplayPtr> displays) override {
+  void OnDisplays(mojo::Array<mojom::WmDisplayPtr> displays) override {
     AddCall("OnDisplays " + DisplayIdsToString(displays));
   }
-  void OnDisplaysChanged(mojo::Array<mojom::DisplayPtr> displays) override {
+  void OnDisplaysChanged(mojo::Array<mojom::WmDisplayPtr> displays) override {
     AddCall("OnDisplaysChanged " + DisplayIdsToString(displays));
   }
   void OnDisplayRemoved(int64_t id) override {
     AddCall("OnDisplayRemoved " + base::Int64ToString(id));
   }
 
   std::string observer_calls_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerObserver);
 };
@@ skipping 152 matching lines @@
   base::subtle::Atomic32 location =
       base::subtle::NoBarrier_Load(cursor_location_memory);
   EXPECT_EQ(gfx::Point(static_cast<int16_t>(location >> 16),
                        static_cast<int16_t>(location & 0xFFFF)),
             gfx::Point(-10, -11));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui