Primary display change notifications.

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"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "services/ui/common/types.h"
 #include "services/ui/common/util.h"
+#include "services/ui/display/platform_screen.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/surfaces/display_compositor.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/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/test_utils.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.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/gfx/geometry/rect.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
+// Stub PlatformScreen implementation so PlatformScreen::GetInstance() doesn't
+// fail.
+class PlatformScreenTest : public display::PlatformScreen {
+ public:
+  PlatformScreenTest() {}
+  ~PlatformScreenTest() override {}
+
+  // display::PlatformScreen:
+  void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
+  void Init(display::PlatformScreenDelegate* delegate) override {}
+  void RequestCloseDisplay(int64_t display_id) override {}
+  int64_t GetPrimaryDisplayId() const override { return 1; }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PlatformScreenTest);
+};
+PlatformScreenTest* platform_screen = new PlatformScreenTest();

[sky, 2016/10/28 17:08:47]

If you create PlatformScreenTest outside of the test environment it means it
lives across tests, and can easily lead to flake in the future. Make it owned by
each test and destroyed at the end of the test, probably as a member of
UserDisplayManagerTest. Also, I would prefix the name with Test rather than
using a suffix of Test. Having of a suffix makes it look like it's an actual
test (e.g. UserDisplayManagerTest), which isn't the case.

[kylechar, 2016/10/28 19:40:37]

Done and done.

+
 class TestDisplayManagerObserver : public mojom::DisplayManagerObserver {
  public:
   TestDisplayManagerObserver() {}
   ~TestDisplayManagerObserver() override {}
 
   std::string GetAndClearObserverCalls() {
     std::string result;
     std::swap(observer_calls_, result);
     return result;
   }
@@ skipping 10 matching lines @@
     std::string display_ids;
     for (const auto& wm_display : wm_displays) {
       if (!display_ids.empty())
         display_ids += " ";
       display_ids += base::Int64ToString(wm_display->display.id());
     }
     return display_ids;
   }
 
   // mojom::DisplayManagerObserver:
-  void OnDisplays(mojo::Array<mojom::WsDisplayPtr> displays) override {
+  void OnDisplays(mojo::Array<mojom::WsDisplayPtr> displays,
+                  int64_t primary_display_id,
+                  int64_t internal_display_id) override {
     AddCall("OnDisplays " + DisplayIdsToString(displays));
   }
   void OnDisplaysChanged(mojo::Array<mojom::WsDisplayPtr> displays) override {
     AddCall("OnDisplaysChanged " + DisplayIdsToString(displays));
   }
   void OnDisplayRemoved(int64_t id) override {
     AddCall("OnDisplayRemoved " + base::Int64ToString(id));
   }
+  void OnPrimaryDisplayChanged(int64_t id) override {
+    AddCall("OnPrimaryDisplayChanged " + base::Int64ToString(id));
+  }
 
   std::string observer_calls_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerObserver);
 };
 
 mojom::FrameDecorationValuesPtr CreateDefaultFrameDecorationValues() {
   return mojom::FrameDecorationValues::New();
 }
 
@@ skipping 138 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