Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

ash/mus/bridge/wm_root_window_controller_mus.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 "ash/mus/bridge/wm_root_window_controller_mus.h"
 
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/root_window_controller.h"
@@ skipping 90 matching lines @@
   init_params->parent_mus = WmWindowMus::GetMusWindow(
       WmWindowMus::Get(root_window_controller_->root())
           ->GetChildByShellWindowId(shell_container_id));
   DCHECK(init_params->parent_mus);
   ui::Window* new_window =
       root_window_controller_->root()->window_tree()->NewWindow(
           &(init_params->mus_properties));
   WmWindowMus::Get(new_window)
       ->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL);
   init_params->native_widget = new views::NativeWidgetMus(
-      widget, new_window, ui::mojom::SurfaceType::DEFAULT);
+      widget, new_window, ui::mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 WmWindow* WmRootWindowControllerMus::FindEventTarget(
     const gfx::Point& location_in_screen) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
   gfx::Point location = root_window_controller_->window_manager()
                             ->window_tree_client()
                             ->GetCursorScreenPoint();
   location -=
       root_window_controller_->display().bounds().origin().OffsetFromOrigin();
   return location;
 }
 
 bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows(
     WmWindow* window) {
   ui::Window* ui_window = WmWindowMus::GetMusWindow(window);
   return ui_window->WasCreatedByThisClient() ||
          ui_window->window_tree()->GetRoots().count(ui_window);
 }
 
 }  // namespace mus
 }  // namespace ash