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

ash/autoclick/mus/autoclick_application.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/autoclick/mus/autoclick_application.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ skipping 95 matching lines @@
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[ui::mojom::WindowManager::kInitialContainerId_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             ash::kShellWindowId_OverlayContainer);
     properties[ui::mojom::WindowManager::kShowState_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
     ui::Window* window =
         window_manager_connection_.get()->NewTopLevelWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
-        widget_.get(), window, ui::mojom::SurfaceType::DEFAULT);
+        widget_.get(), window, ui::mojom::CompositorFrameSinkType::DEFAULT);
     widget_->Init(params);
   } else {
     widget_->Close();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 }
 
 void AutoclickApplication::SetAutoclickDelay(uint32_t delay_in_milliseconds) {
   autoclick_controller_common_->SetAutoclickDelay(
       base::TimeDelta::FromMilliseconds(delay_in_milliseconds));
@@ skipping 29 matching lines @@
   // TODO(riajiang): Currently not working. Need to know how to generate events
   // in mus world (crbug.com/628665).
 }
 
 void AutoclickApplication::OnAutoclickCanceled() {
   // Not used in mus.
 }
 
 }  // namespace autoclick
 }  // namespace ash