Unify display ids between Display and PlatformDisplay.

services/ui/ws/test_utils.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 "services/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/ui/surfaces/surfaces_state.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window_surface_manager_test_api.h"
 #include "services/ui/ws/window_manager_access_policy.h"
 #include "services/ui/ws/window_manager_window_tree_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
 // -----------------------------------------------------------------------------
 // Empty implementation of PlatformDisplay.
 class TestPlatformDisplay : public PlatformDisplay {
  public:
-  explicit TestPlatformDisplay(int32_t* cursor_id_storage)
-      : cursor_id_storage_(cursor_id_storage) {
+  explicit TestPlatformDisplay(int64_t id, int32_t* cursor_id_storage)
+      : id_(id), cursor_id_storage_(cursor_id_storage) {
     display_metrics_.bounds = gfx::Rect(0, 0, 400, 300);
     display_metrics_.device_scale_factor = 1.f;
   }
   ~TestPlatformDisplay() override {}
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override {
     // It is necessary to tell the delegate about the ViewportMetrics to make
     // sure that the DisplayBinding is correctly initialized (and a root-window
     // is created).
     delegate->OnViewportMetricsChanged(ViewportMetrics(), display_metrics_);
   }
+  int64_t GetId() const override { return id_; }
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override {}
   void SetViewportSize(const gfx::Size& size) override {}
   void SetTitle(const base::string16& title) override {}
   void SetCapture() override {}
   void ReleaseCapture() override {}
   void SetCursorById(int32_t cursor) override { *cursor_id_storage_ = cursor; }
   ::display::Display::Rotation GetRotation() override {
     return ::display::Display::Rotation::ROTATE_0;
   }
   float GetDeviceScaleFactor() override {
     return display_metrics_.device_scale_factor;
   }
   void UpdateTextInputState(const ui::TextInputState& state) override {}
   void SetImeVisibility(bool visible) override {}
   bool IsFramePending() const override { return false; }
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) override {}
-  int64_t GetDisplayId() const override { return 1; }
   gfx::Rect GetBounds() const override { return display_metrics_.bounds; }
 
  private:
   ViewportMetrics display_metrics_;
 
+  int64_t id_;
   int32_t* cursor_id_storage_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay);
 };
 
 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) {
   ClientWindowId client_id;
   for (ClientSpecificId id = 1;; ++id) {
     // Used the id of the client in the upper bits to simplify things.
     const ClientWindowId client_id =
@@ skipping 25 matching lines @@
 
 // TestPlatformDisplayFactory  -------------------------------------------------
 
 TestPlatformDisplayFactory::TestPlatformDisplayFactory(
     int32_t* cursor_id_storage)
     : cursor_id_storage_(cursor_id_storage) {}
 
 TestPlatformDisplayFactory::~TestPlatformDisplayFactory() {}
 
 PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay() {
-  return new TestPlatformDisplay(cursor_id_storage_);
+  return new TestPlatformDisplay(next_display_id_++, cursor_id_storage_);
 }
 
 // TestFrameGeneratorDelegate -------------------------------------------------
 
 TestFrameGeneratorDelegate::TestFrameGeneratorDelegate(
     std::unique_ptr<ServerWindow> root)
     : root_(std::move(root)) {}
 
 TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {}
 
@@ skipping 399 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui