Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/test_change_tracker.cc

 // Copyright 2014 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_change_tracker.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 124 matching lines @@
 
     case CHANGE_TYPE_ON_TOP_LEVEL_CREATED:
       return base::StringPrintf("TopLevelCreated id=%d window_id=%s drawn=%s",
                                 change.change_id,
                                 WindowIdToString(change.window_id).c_str(),
                                 change.bool_value ? "true" : "false");
     case CHANGE_TYPE_OPACITY:
       return base::StringPrintf("OpacityChanged window_id=%s opacity=%.2f",
                                 WindowIdToString(change.window_id).c_str(),
                                 change.float_value);
-    case CHANGE_TYPE_SURFACE_CHANGED:
-      return base::StringPrintf("SurfaceCreated window_id=%s surface_id=%s",
-                                WindowIdToString(change.window_id).c_str(),
-                                change.surface_id.ToString().c_str());
   }
   return std::string();
 }
 
 std::string SingleChangeToDescriptionImpl(const std::vector<Change>& changes,
                                           ChangeDescriptionType change_type) {
   std::string result;
   for (auto& change : changes) {
     if (!result.empty())
       result += "\n";
@@ skipping 259 matching lines @@
                                           mojom::WindowDataPtr window_data,
                                           bool drawn) {
   Change change;
   change.type = CHANGE_TYPE_ON_TOP_LEVEL_CREATED;
   change.change_id = change_id;
   change.window_id = window_data->window_id;
   change.bool_value = drawn;
   AddChange(change);
 }
 
-void TestChangeTracker::OnWindowSurfaceChanged(
-    Id window_id,
-    const cc::SurfaceId& surface_id,
-    const cc::SurfaceSequence& surface_sequence,
-    const gfx::Size& frame_size,
-    float device_scale_factor) {
-  Change change;
-  change.type = CHANGE_TYPE_SURFACE_CHANGED;
-  change.window_id = window_id;
-  change.surface_id = surface_id;
-  change.surface_sequence = surface_sequence;
-  change.frame_size = frame_size;
-  change.device_scale_factor = device_scale_factor;
-  AddChange(change);
-}
-
 void TestChangeTracker::AddChange(const Change& change) {
   changes_.push_back(change);
   if (delegate_)
     delegate_->OnChangeAdded();
 }
 
 TestWindow::TestWindow() {}
 
 TestWindow::TestWindow(const TestWindow& other) = default;
 
 TestWindow::~TestWindow() {}
 
 std::string TestWindow::ToString() const {
   return base::StringPrintf("window=%s parent=%s",
                             WindowIdToString(window_id).c_str(),
                             WindowIdToString(parent_id).c_str());
 }
 
 std::string TestWindow::ToString2() const {
   return base::StringPrintf(
       "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(),
       WindowIdToString(parent_id).c_str(), visible ? "true" : "false");
 }
 
 }  // namespace ws
 
 }  // namespace ui