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

ui/views/mus/native_widget_mus_unittest.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
@@ skipping 582 matching lines @@
   // NOTE: the order here is important, we purposefully add the
   // ui::WindowObserver before creating NativeWidgetMus, which also adds its
   // own observer.
   window->AddObserver(&observer);
 
   std::unique_ptr<Widget> widget(new Widget());
   observer.set_widget(widget.get());
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = initial_bounds();
-  params.native_widget = new NativeWidgetMus(widget.get(), window,
-                                             ui::mojom::SurfaceType::DEFAULT);
+  params.native_widget = new NativeWidgetMus(
+      widget.get(), window, ui::mojom::CompositorFrameSinkType::DEFAULT);
   widget->Init(params);
   window->SetSharedProperty<int32_t>(
       ui::mojom::WindowManager::kShowState_Property,
       static_cast<uint32_t>(ui::mojom::ShowState::MAXIMIZED));
   EXPECT_TRUE(widget->IsMaximized());
 }
 
 }  // namespace views