Only send the FrameSinkId to client when it is necessary

services/ui/test_wm/test_wm.cc

Index: services/ui/test_wm/test_wm.cc
diff --git a/services/ui/test_wm/test_wm.cc b/services/ui/test_wm/test_wm.cc
index da4b6812063c40a07bb80c8396194c03163f5f92..a61fc4e29bffc2ee53069f578c8baddd6f924320 100644
--- a/services/ui/test_wm/test_wm.cc
+++ b/services/ui/test_wm/test_wm.cc
@@ -13,6 +13,7 @@
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/property_converter.h"
@@ -112,6 +113,8 @@ class TestWM : public service_manager::Service,
       ui::mojom::WindowType window_type,
       std::map<std::string, std::vector<uint8_t>>* properties) override {
     aura::Window* window = new aura::Window(nullptr);
+    window->SetProperty(aura::client::kEmbedType,
+                        aura::client::WindowEmbedType::TOP_LEVEL_IN_WM);
     SetWindowType(window, window_type);
     window->Init(LAYER_NOT_DRAWN);
     window->SetBounds(gfx::Rect(10, 10, 500, 500));