Only send the FrameSinkId to client when it is necessary

services/ui/ws/window_tree_unittest.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/window_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 741 matching lines @@
                 "OnFrameSinkIdAllocated window=%s %s",
                 WindowIdToString(WindowIdFromTransportId(embed_window_id2.id))
                     .c_str(),
                 embed_window->frame_sink_id().ToString().c_str()),
             SingleChangeToDescription(*wm_client()->tracker()->changes()));
   EXPECT_FALSE(child_binding->is_paused());
   // TODO(fsamuel): Currently the FrameSinkId maps directly to the server's
   // window ID. This is likely bad from a security perspective and should be
   // fixed.
   EXPECT_EQ(
-      base::StringPrintf(
-          "TopLevelCreated id=17 FrameSinkId(%d, 0) window_id=%s drawn=true",
-          WindowIdToTransportId(embed_window->id()),
-          WindowIdToString(
-              WindowIdFromTransportId(embed_window_id2_in_child.id))
-              .c_str()),
+      base::StringPrintf("TopLevelCreated id=17 window_id=%s drawn=true",
+                         WindowIdToString(WindowIdFromTransportId(
+                                              embed_window_id2_in_child.id))
+                             .c_str()),
       SingleChangeToDescription(
           *child_binding->client()->tracker()->changes()));
   child_binding->client()->tracker()->changes()->clear();
 
   // Change the visibility of the window from the owner and make sure the
   // client sees the right id.
   EXPECT_TRUE(embed_window->visible());
   ASSERT_TRUE(wm_tree()->SetWindowVisibility(
       ClientWindowIdForWindow(wm_tree(), embed_window), false));
   EXPECT_FALSE(embed_window->visible());
@@ skipping 813 matching lines @@
   EXPECT_TRUE(window_manager_tree->DeleteWindow(display_root_id));
   EXPECT_TRUE(window_manager_tree->roots().empty());
   EXPECT_TRUE(WindowManagerStateTestApi(window_manager_state)
                   .window_manager_display_roots()
                   .empty());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui