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

services/navigation/view_impl.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/navigation/view_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/interstitial_page.h"
@@ skipping 248 matching lines @@
 }
 
 void ViewImpl::OnEmbed(ui::Window* root) {
   DCHECK(!widget_.get());
   widget_.reset(new views::Widget);
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = this;
   params.native_widget = new views::NativeWidgetMus(
-      widget_.get(), root, ui::mojom::SurfaceType::DEFAULT);
+      widget_.get(), root, ui::mojom::CompositorFrameSinkType::DEFAULT);
   widget_->Init(params);
   widget_->Show();
 }
 
 void ViewImpl::OnEmbedRootDestroyed(ui::Window* root) {
   window_tree_client_.reset();
 }
 
 void ViewImpl::OnLostConnection(ui::WindowTreeClient* client) {
   window_tree_client_.reset();
 }
 
 void ViewImpl::OnPointerEventObserved(const ui::PointerEvent& event,
                                       ui::Window* target) {}
 
 views::View* ViewImpl::GetContentsView() {
   return web_view_;
 }
 
 views::Widget* ViewImpl::GetWidget() {
   return web_view_->GetWidget();
 }
 
 const views::Widget* ViewImpl::GetWidget() const {
   return web_view_->GetWidget();
 }
 
 }  // navigation