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

ui/views/mus/window_manager_connection.cc

 // Copyright 2015 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/window_manager_connection.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 113 matching lines @@
   // TYPE_CONTROL widgets require a NativeWidgetAura. So we let this fall
   // through, so that the default NativeWidgetPrivate::CreateNativeWidget() is
   // used instead.
   if (init_params.type == Widget::InitParams::TYPE_CONTROL)
     return nullptr;
   std::map<std::string, std::vector<uint8_t>> properties = props;
   NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
   properties[ui::mojom::WindowManager::kAppID_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(identity_.name());
   return new NativeWidgetMus(delegate, NewTopLevelWindow(properties),
-                             ui::mojom::SurfaceType::DEFAULT);
+                             ui::mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 const std::set<ui::Window*>& WindowManagerConnection::GetRoots() const {
   return client_->GetRoots();
 }
 
 WindowManagerConnection::WindowManagerConnection(
     service_manager::Connector* connector,
     const service_manager::Identity& identity,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
@@ skipping 65 matching lines @@
   std::copy(roots.begin(), roots.end(), std::back_inserter(windows));
   return GetWindowFrom(display_origins, windows, point);
 }
 
 std::unique_ptr<OSExchangeData::Provider>
 WindowManagerConnection::BuildProvider() {
   return base::MakeUnique<OSExchangeDataProviderMus>();
 }
 
 }  // namespace views