chromeos: Changes DisplayManagerObserver to have a single function

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 "services/ui/ws/user_display_manager.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 52 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(std::vector<mojom::WsDisplayPtr> displays,
-                  int64_t primary_display_id,
-                  int64_t internal_display_id) override {
-    AddCall("OnDisplays " + DisplayIdsToString(displays));
-  }
-  void OnDisplaysChanged(std::vector<mojom::WsDisplayPtr> displays) override {
+  void OnDisplaysChanged(std::vector<mojom::WsDisplayPtr> displays,
+                         int64_t primary_display_id,
+                         int64_t internal_display_id) 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));
-  }
 
   mojo::Binding<mojom::DisplayManagerObserver> binding_;
   std::string observer_calls_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerObserver);
 };
 
 mojom::FrameDecorationValuesPtr CreateDefaultFrameDecorationValues() {
   return mojom::FrameDecorationValues::New();
 }
@@ skipping 43 matching lines @@
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Set the frame decoration values, which should trigger sending immediately.
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
   RunUntilIdle();
 
-  EXPECT_EQ("OnDisplays 1",
+  EXPECT_EQ("OnDisplaysChanged 1",
             display_manager_observer1.GetAndClearObserverCalls());
 }
 
 TEST_F(UserDisplayManagerTest, AddObserverAfterFrameDecorationsSet) {
   screen_manager().AddDisplay();
 
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
 
   user_display_manager1->AddObserver(display_manager_observer1.GetPtr());
   RunUntilIdle();
 
-  EXPECT_EQ("OnDisplays 1",
+  EXPECT_EQ("OnDisplaysChanged 1",
             display_manager_observer1.GetAndClearObserverCalls());
 }
 
 TEST_F(UserDisplayManagerTest, AddRemoveDisplay) {
   screen_manager().AddDisplay();
 
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
   user_display_manager1->AddObserver(display_manager_observer1.GetPtr());
   RunUntilIdle();
 
-  EXPECT_EQ("OnDisplays 1",
+  EXPECT_EQ("OnDisplaysChanged 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Add another display.
   const int64_t second_display_id = screen_manager().AddDisplay();
   RunUntilIdle();
 
   // Observer should be notified immediately as frame decorations were set.
-  EXPECT_EQ("OnDisplaysChanged 2",
+  EXPECT_EQ("OnDisplaysChanged 1 2",
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Remove the display and verify observer is notified.
   screen_manager().RemoveDisplay(second_display_id);
   RunUntilIdle();
 
-  EXPECT_EQ("OnDisplayRemoved 2",
+  EXPECT_EQ("OnDisplaysChanged 1",
             display_manager_observer1.GetAndClearObserverCalls());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui