[M60] exo: Fix multi-display hardware cursor

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc

 // Copyright 2017 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 "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
 
 #include <unordered_map>
 #include <utility>
 
 #include "base/command_line.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/accessibility_helper.mojom.h"
 #include "components/exo/wm_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 
 namespace arc {
 
 class ArcAccessibilityHelperBridgeTest : public testing::Test {
  public:
   class FakeWMHelper : public exo::WMHelper {
    public:
     FakeWMHelper() = default;
 
    private:
-    const display::ManagedDisplayInfo GetDisplayInfo(
+    const display::ManagedDisplayInfo& GetDisplayInfo(
         int64_t display_id) const override {
-      return display::ManagedDisplayInfo(display_id, "", false);
+      static const display::ManagedDisplayInfo info;
+      return info;
     }
-    aura::Window* GetContainer(int container_id) override { return nullptr; }
+    aura::Window* GetPrimaryDisplayContainer(int container_id) override {
+      return nullptr;
+    }
     aura::Window* GetActiveWindow() const override { return nullptr; }
     aura::Window* GetFocusedWindow() const override { return nullptr; }
     ui::CursorSetType GetCursorSet() const override {
       return ui::CursorSetType::CURSOR_SET_NORMAL;
     }
+    const display::Display& GetCursorDisplay() const override {
+      static const display::Display display;
+      return display;
+    }
     void AddPreTargetHandler(ui::EventHandler* handler) override {}
     void PrependPreTargetHandler(ui::EventHandler* handler) override {}
     void RemovePreTargetHandler(ui::EventHandler* handler) override {}
     void AddPostTargetHandler(ui::EventHandler* handler) override {}
     void RemovePostTargetHandler(ui::EventHandler* handler) override {}
     bool IsMaximizeModeWindowManagerEnabled() const override { return false; }
 
     DISALLOW_COPY_AND_ASSIGN(FakeWMHelper);
   };
 
@@ skipping 109 matching lines @@
   helper_bridge->OnAccessibilityEvent(event.Clone());
   ASSERT_EQ(0U, package_to_tree.size());
 
   // Task 1 is now current.
   helper_bridge->OnTaskSetActive(1);
   helper_bridge->OnAccessibilityEvent(event.Clone());
   ASSERT_EQ(1U, package_to_tree.size());
 }
 
 }  // namespace arc