Move Mus into chrome's process when running with --mus.

services/ui/ws/user_display_manager.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 <utility>
 
+#include "services/ui/display/screen_manager.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "ui/display/display.h"
-#include "ui/display/screen.h"
+#include "ui/display/screen_base.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ui {
 namespace ws {
 namespace {
 
 int64_t GetInternalDisplayId() {
   if (!display::Display::HasInternalDisplay())
     return display::kInvalidDisplayId;
 
@@ skipping 66 matching lines @@
 mojom::WsDisplayPtr UserDisplayManager::ToWsDisplayPtr(
     const display::Display& display) {
   mojom::WsDisplayPtr ws_display = mojom::WsDisplay::New();
   ws_display->display = display;
   delegate_->GetFrameDecorationsForUser(user_id_,
                                         &ws_display->frame_decoration_values);
   return ws_display;
 }
 
 std::vector<mojom::WsDisplayPtr> UserDisplayManager::GetAllDisplays() {
-  const auto& displays = display::Screen::GetScreen()->GetAllDisplays();
+  const auto& displays =
+      display::ScreenManager::GetInstance()->GetScreen()->GetAllDisplays();
 
   std::vector<mojom::WsDisplayPtr> ws_display;
   ws_display.reserve(displays.size());
 
   for (const auto& display : displays)
     ws_display.push_back(ToWsDisplayPtr(display));
 
   return ws_display;
 }
 
 bool UserDisplayManager::ShouldCallOnDisplaysChanged() const {
-  return got_valid_frame_decorations_ &&
-         !display::Screen::GetScreen()->GetAllDisplays().empty();
+  return got_valid_frame_decorations_ && !display::ScreenManager::GetInstance()
+                                              ->GetScreen()
+                                              ->GetAllDisplays()
+                                              .empty();
 }
 
 void UserDisplayManager::CallOnDisplaysChangedIfNecessary() {
   if (!notify_automatically_ || !ShouldCallOnDisplaysChanged())
     return;
 
   CallOnDisplaysChanged();
 }
 
 void UserDisplayManager::CallOnDisplaysChanged(
     mojom::DisplayManagerObserver* observer) {
-  observer->OnDisplaysChanged(
-      GetAllDisplays(), display::Screen::GetScreen()->GetPrimaryDisplay().id(),
-      GetInternalDisplayId());
+  observer->OnDisplaysChanged(GetAllDisplays(),
+                              display::ScreenManager::GetInstance()
+                                  ->GetScreen()
+                                  ->GetPrimaryDisplay()
+                                  .id(),
+                              GetInternalDisplayId());
 }
 
 }  // namespace ws
 }  // namespace ui