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

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 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 "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shared/immersive_revealed_lock.h"
 #include "ash/shell.h"
@@ skipping 224 matching lines @@
   window_properties
       [ui::mojom::WindowManager::kRendererParentTitleArea_Property] =
           mojo::ConvertTo<std::vector<uint8_t>>(true);
   window_properties[ui::mojom::WindowManager::kName_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           std::string("ChromeImmersiveRevealWindow"));
   init_params.native_widget = new views::NativeWidgetMus(
       mash_reveal_widget_.get(),
       views::WindowManagerConnection::Get()->client()->NewWindow(
           &window_properties),
-      ui::mojom::SurfaceType::DEFAULT);
+      ui::mojom::CompositorFrameSinkType::DEFAULT);
   init_params.accept_events = false;
   init_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   init_params.parent_mus = GetMusWindow(native_window_);
   const gfx::Rect& top_container_bounds =
       browser_view_->top_container()->bounds();
   init_params.bounds =
       gfx::Rect(0, -top_container_bounds.height(), top_container_bounds.width(),
                 top_container_bounds.height());
   mash_reveal_widget_->Init(init_params);
@@ skipping 102 matching lines @@
   // the shelf completely and prevent it from being revealed.
   bool in_tab_fullscreen = content::Source<FullscreenController>(source)->
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)
       ->set_hide_shelf_when_fullscreen(in_tab_fullscreen);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_changed)
     LayoutBrowserRootView();
 }