Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/test_utils.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/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 339 matching lines @@
 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) {
   tracker_.OnWindowFocused(focused_window_id);
 }
 
 void TestWindowTreeClient::OnWindowPredefinedCursorChanged(
     uint32_t window_id,
     mojom::Cursor cursor_id) {
   tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id);
 }
 
-void TestWindowTreeClient::OnWindowSurfaceChanged(
-    Id window_id,
-    const cc::SurfaceId& surface_id,
-    const cc::SurfaceSequence& surface_sequence,
-    const gfx::Size& frame_size,
-    float device_scale_factor) {}
-
 void TestWindowTreeClient::OnDragDropStart(
     mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) {}
 
 void TestWindowTreeClient::OnDragEnter(uint32_t window,
                                        uint32_t key_state,
                                        const gfx::Point& position,
                                        uint32_t effect_bitmask,
                                        const OnDragEnterCallback& callback) {}
 
 void TestWindowTreeClient::OnDragOver(uint32_t window,
@@ skipping 108 matching lines @@
   // Destroy |window_server_| while the message-loop is still alive.
   window_server_.reset();
 }
 
 // WindowEventTargetingHelper ------------------------------------------------
 
 WindowEventTargetingHelper::WindowEventTargetingHelper()
     : wm_client_(nullptr),
       display_binding_(nullptr),
       display_(nullptr),
-      display_compositor_(new DisplayCompositor(nullptr)) {
+      display_compositor_(new DisplayCompositor()) {
   PlatformDisplayInitParams display_init_params;
   display_init_params.display_compositor = display_compositor_;
   display_ = new Display(window_server(), display_init_params);
   display_binding_ = new TestDisplayBinding(window_server());
   display_->Init(base::WrapUnique(display_binding_));
   wm_client_ = ws_test_helper_.window_server_delegate()->last_client();
   wm_client_->tracker()->changes()->clear();
 }
 
 WindowEventTargetingHelper::~WindowEventTargetingHelper() {}
@@ skipping 101 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui