Only send the FrameSinkId to client when it is necessary

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 20 matching lines @@
   ONE,
   TWO,
 };
 
 std::string ChangeToDescription(const Change& change,
                                 ChangeDescriptionType type) {
   switch (change.type) {
     case CHANGE_TYPE_EMBED:
       if (type == ChangeDescriptionType::ONE)
         return "OnEmbed";
-      return base::StringPrintf("OnEmbed %s drawn=%s",
-                                change.frame_sink_id.ToString().c_str(),
+      return base::StringPrintf("OnEmbed drawn=%s",
                                 change.bool_value ? "true" : "false");
 
     case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED:
       return base::StringPrintf("OnEmbeddedAppDisconnected window=%s",
                                 WindowIdToString(change.window_id).c_str());
 
     case CHANGE_TYPE_UNEMBED:
       return base::StringPrintf("OnUnembed window=%s",
                                 WindowIdToString(change.window_id).c_str());
 
@@ skipping 81 matching lines @@
     case CHANGE_TYPE_CURSOR_CHANGED:
       return base::StringPrintf("CursorChanged id=%s cursor_type=%d",
                                 WindowIdToString(change.window_id).c_str(),
                                 static_cast<int>(change.cursor_type));
     case CHANGE_TYPE_ON_CHANGE_COMPLETED:
       return base::StringPrintf("ChangeCompleted id=%d sucess=%s",
                                 change.change_id,
                                 change.bool_value ? "true" : "false");
 
     case CHANGE_TYPE_ON_TOP_LEVEL_CREATED:
-      return base::StringPrintf(
-          "TopLevelCreated id=%d %s window_id=%s drawn=%s", change.change_id,
-          change.frame_sink_id.ToString().c_str(),
-          WindowIdToString(change.window_id).c_str(),
-          change.bool_value ? "true" : "false");
+      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();
@@ skipping 78 matching lines @@
 Change::Change(const Change& other) = default;
 
 Change::~Change() {}
 
 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {}
 
 TestChangeTracker::~TestChangeTracker() {}
 
 void TestChangeTracker::OnEmbed(ClientSpecificId client_id,
                                 mojom::WindowDataPtr root,
-                                bool drawn,
-                                const cc::FrameSinkId& frame_sink_id) {
+                                bool drawn) {
   Change change;
   change.type = CHANGE_TYPE_EMBED;
   change.client_id = client_id;
   change.bool_value = drawn;
-  change.frame_sink_id = frame_sink_id;
   change.windows.push_back(WindowDataToTestWindow(root));
   AddChange(change);
 }
 
 void TestChangeTracker::OnEmbeddedAppDisconnected(Id window_id) {
   Change change;
   change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED;
   change.window_id = window_id;
   AddChange(change);
 }
@@ skipping 167 matching lines @@
 }
 
 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) {
   Change change;
   change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED;
   change.change_id = change_id;
   change.bool_value = success;
   AddChange(change);
 }
 
-void TestChangeTracker::OnTopLevelCreated(
-    uint32_t change_id,
-    mojom::WindowDataPtr window_data,
-    bool drawn,
-    const cc::FrameSinkId& frame_sink_id) {
+void TestChangeTracker::OnTopLevelCreated(uint32_t change_id,
+                                          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;
-  change.frame_sink_id = frame_sink_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowSurfaceChanged(
     Id window_id,
     const cc::SurfaceInfo& surface_info) {
   Change change;
   change.type = CHANGE_TYPE_SURFACE_CHANGED;
   change.window_id = window_id;
   change.surface_id = surface_info.id();
@@ skipping 22 matching lines @@
 
 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