Rename PlatformScreen to ScreenManager.

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "services/ui/display/platform_screen.h"
+#include "services/ui/display/screen_manager.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/display_manager.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/drag_controller.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_id.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_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 
 // Collection of utilities useful in creating mus tests.
 
 // Test PlatformDisplay instance that allows adding/modifying/removing displays.

[msw, 2016/12/01 20:01:19]

nit: update comment, you've been pretty thorough, but please make sure "git gs
PlatformScreen", "git gs platform_screen", etc. come up empty... I'm guessing
this is simply an outdated reference to a similar "PlatformDisplay" class?

[kylechar, 2016/12/01 21:08:21]

My bad. I mixed up PlatformDisplay and PlatformScreen when writing the comment
originally. Fixed. I've grepped for PlatformScreen that got missed and didn't
see anything.

 // Tracks display ids to perform some basic verification that no duplicates are
 // added and display was added before being modified or removed. Display ids
 // reset when Init() is called.
-class TestPlatformScreen : public display::PlatformScreen {
+class TestScreenManager : public display::ScreenManager {
  public:
-  TestPlatformScreen();
-  ~TestPlatformScreen() override;
+  TestScreenManager();
+  ~TestScreenManager() override;
 
   // Adds a new display with default metrics, generates a unique display id and
   // returns it. Calls OnDisplayAdded() on delegate.
   int64_t AddDisplay();
 
   // Adds a new display with provided |metrics|, generates a unique display id
   // and returns it. Calls OnDisplayAdded() on delegate.
   int64_t AddDisplay(const display::ViewportMetrics& metrics);
 
   // Calls OnDisplayModified() on delegate.
   void ModifyDisplay(int64_t id, const display::ViewportMetrics& metrics);
 
   // Calls OnDisplayRemoved() on delegate.
   void RemoveDisplay(int64_t id);
 
-  // display::PlatformScreen:
+  // display::ScreenManager:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
-  void Init(display::PlatformScreenDelegate* delegate) override;
+  void Init(display::ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override {}
   int64_t GetPrimaryDisplayId() const override;
 
  private:
-  display::PlatformScreenDelegate* delegate_;
+  display::ScreenManagerDelegate* delegate_;
   int64_t primary_display_id_ = display::kInvalidDisplayId;
   std::set<int64_t> display_ids_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
+  DISALLOW_COPY_AND_ASSIGN(TestScreenManager);
 };
 
 // -----------------------------------------------------------------------------
 
 class UserActivityMonitorTestApi {
  public:
   explicit UserActivityMonitorTestApi(UserActivityMonitor* monitor)
       : monitor_(monitor) {}
 
   void SetTimerTaskRunner(
@@ skipping 583 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_