Move shell/platform/common/cpp to shell/platform/common (#24210)

BUILD.gn

@@ -135,15 +135,15 @@ group("flutter") {
     # embeddings are being built.
     if (enable_desktop_embeddings) {
       public_deps += [
-        "//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
-        "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
+        "//flutter/shell/platform/common:common_cpp_core_unittests",
+        "//flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
       ]
 
       if (!is_fuchsia) {
         # These tests require the embedder and thus cannot run on fuchsia.
         # TODO(): Enable when embedder works on fuchsia.
         public_deps +=
-            [ "//flutter/shell/platform/common/cpp:common_cpp_unittests" ]
+            [ "//flutter/shell/platform/common:common_cpp_unittests" ]
 
         # These tests require GLFW and thus cannot run on fuchsia.
         public_deps += [ "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests" ]

ci/licenses_golden/licenses_flutter

@@ -880,77 +880,77 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc
 FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.cc
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/core_implementations.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/engine_method_result.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.cc
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.h
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.cc
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.h
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/geometry.h
-FILE: ../../../flutter/shell/platform/common/cpp/geometry_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.cc
-FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils.cc
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils.h
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_export.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_messenger.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_texture_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.cc
-FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.cc
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/text_range.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_range_unittests.cc
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge.h
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc
+FILE: ../../../flutter/shell/platform/common/engine_switches.cc
+FILE: ../../../flutter/shell/platform/common/engine_switches.h
+FILE: ../../../flutter/shell/platform/common/engine_switches_unittests.cc
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc
+FILE: ../../../flutter/shell/platform/common/geometry.h
+FILE: ../../../flutter/shell/platform/common/geometry_unittests.cc
+FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc
+FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h
+FILE: ../../../flutter/shell/platform/common/json_message_codec.cc
+FILE: ../../../flutter/shell/platform/common/json_message_codec.h
+FILE: ../../../flutter/shell/platform/common/json_message_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/json_method_codec.cc
+FILE: ../../../flutter/shell/platform/common/json_method_codec.h
+FILE: ../../../flutter/shell/platform/common/json_method_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/path_utils.cc
+FILE: ../../../flutter/shell/platform/common/path_utils.h
+FILE: ../../../flutter/shell/platform/common/path_utils_unittests.cc
+FILE: ../../../flutter/shell/platform/common/public/flutter_export.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_messenger.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_plugin_registrar.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_texture_registrar.h
+FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc
+FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.h
+FILE: ../../../flutter/shell/platform/common/text_input_model.cc
+FILE: ../../../flutter/shell/platform/common/text_input_model.h
+FILE: ../../../flutter/shell/platform/common/text_input_model_unittests.cc
+FILE: ../../../flutter/shell/platform/common/text_range.h
+FILE: ../../../flutter/shell/platform/common/text_range_unittests.cc
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
 FILE: ../../../flutter/shell/platform/darwin/common/command_line.h

shell/platform/common/BUILD.gn

@@ -109,7 +109,7 @@ source_set("common_cpp") {
 
   deps = [
     ":common_cpp_library_headers",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
   ]
 
@@ -175,8 +175,8 @@ if (enable_unittests) {
       ":common_cpp_fixtures",
       ":common_cpp_input",
       ":common_cpp_switches",
-      "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
-      "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs",
+      "//flutter/shell/platform/common/client_wrapper:client_wrapper",
+      "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
       "//flutter/testing",
     ]
 

shell/platform/common/client_wrapper/BUILD.gn

@@ -11,13 +11,13 @@ source_set("client_wrapper") {
   public = core_cpp_client_wrapper_includes +
            core_cpp_client_wrapper_internal_headers
 
-  deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
+  deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
 
   configs +=
-      [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+      [ "//flutter/shell/platform/common:desktop_library_implementation" ]
 
   public_configs =
-      [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ]
+      [ "//flutter/shell/platform/common:relative_flutter_library_headers" ]
 }
 
 source_set("client_wrapper_library_stubs") {
@@ -28,8 +28,7 @@ source_set("client_wrapper_library_stubs") {
 
   defines = [ "FLUTTER_DESKTOP_LIBRARY" ]
 
-  public_deps =
-      [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
+  public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
 }
 
 test_fixtures("client_wrapper_fixtures") {

shell/platform/common/client_wrapper/basic_message_channel_unittests.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
 
 #include <memory>
 #include <string>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/encodable_value_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 
 #include <limits>
 

shell/platform/common/client_wrapper/event_channel_unittests.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h"
 
 #include <memory>
 #include <string>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/include/flutter/encodable_value.h

@@ -63,8 +63,8 @@ class CustomEncodableValue {
   ~CustomEncodableValue() = default;
 
   // Allow implict conversion to std::any to allow direct use of any_cast.
-  operator std::any &() { return value_; }
-  operator const std::any &() const { return value_; }
+  operator std::any&() { return value_; }
+  operator const std::any&() const { return value_; }
 
 #if defined(FLUTTER_ENABLE_RTTI) && FLUTTER_ENABLE_RTTI
   // Passthrough to std::any's type().

shell/platform/common/client_wrapper/method_call_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h"
 
 #include <memory>
 #include <string>

shell/platform/common/client_wrapper/method_channel_unittests.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 
 #include <memory>
 #include <string>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/method_result_functions_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
 
 #include <functional>
 #include <string>

shell/platform/common/client_wrapper/plugin_registrar_unittests.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
 
 #include <memory>
 #include <vector>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/standard_message_codec_unittests.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 
 #include <map>
 #include <vector>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/standard_method_codec_unittests.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/client_wrapper/testing/stub_flutter_api.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h"
 
 static flutter::testing::StubFlutterApi* s_stub_implementation;
 

shell/platform/common/client_wrapper/testing/stub_flutter_api.h

@@ -7,14 +7,14 @@
 
 #include <memory>
 
-#include "flutter/shell/platform/common/cpp/public/flutter_messenger.h"
-#include "flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h"
+#include "flutter/shell/platform/common/public/flutter_messenger.h"
+#include "flutter/shell/platform/common/public/flutter_plugin_registrar.h"
 
 namespace flutter {
 namespace testing {
 
 // Base class for a object that provides test implementations of the APIs in
-// the headers in platform/common/cpp/public/.
+// the headers in platform/common/public/.
 
 // Linking this class into a test binary will provide dummy forwarding
 // implementantions of that C API, so that the wrapper can be tested separately

shell/platform/common/client_wrapper/testing/test_codec_extensions.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/test_codec_extensions.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/test_codec_extensions.h"
 
 namespace flutter {
 

shell/platform/common/client_wrapper/testing/test_codec_extensions.h

@@ -5,8 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CPP_CLIENT_WRAPPER_TESTING_TEST_CODEC_EXTENSIONS_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CPP_CLIENT_WRAPPER_TESTING_TEST_CODEC_EXTENSIONS_H_
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h"
 
 namespace flutter {
 

shell/platform/common/client_wrapper/texture_registrar_unittests.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/testing/stub_flutter_api.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
+#include "flutter/shell/platform/common/client_wrapper/testing/stub_flutter_api.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/engine_switches.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/engine_switches.h"
+#include "flutter/shell/platform/common/engine_switches.h"
 
 #include <algorithm>
 #include <cstdlib>

shell/platform/common/engine_switches_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/engine_switches.h"
+#include "flutter/shell/platform/common/engine_switches.h"
 
 #include "gtest/gtest.h"
 

shell/platform/common/geometry_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/geometry.h"
+#include "flutter/shell/platform/common/geometry.h"
 
 #include "gtest/gtest.h"
 

shell/platform/common/incoming_message_dispatcher.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h"
+#include "flutter/shell/platform/common/incoming_message_dispatcher.h"
 
 namespace flutter {
 

shell/platform/common/incoming_message_dispatcher.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <utility>
 
-#include "flutter/shell/platform/common/cpp/public/flutter_messenger.h"
+#include "flutter/shell/platform/common/public/flutter_messenger.h"
 
 namespace flutter {
 

shell/platform/common/json_message_codec.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/json_message_codec.h"
+#include "flutter/shell/platform/common/json_message_codec.h"
 
 #include <iostream>
 #include <string>

shell/platform/common/json_message_codec.h

@@ -7,7 +7,7 @@
 
 #include <rapidjson/document.h>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h"
 
 namespace flutter {
 

shell/platform/common/json_message_codec_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/json_message_codec.h"
+#include "flutter/shell/platform/common/json_message_codec.h"
 
 #include <limits>
 #include <map>

shell/platform/common/json_method_codec.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/json_method_codec.h"
+#include "flutter/shell/platform/common/json_method_codec.h"
 
-#include "flutter/shell/platform/common/cpp/json_message_codec.h"
+#include "flutter/shell/platform/common/json_message_codec.h"
 
 namespace flutter {
 

shell/platform/common/json_method_codec.h

@@ -7,8 +7,8 @@
 
 #include <rapidjson/document.h>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h"
 
 namespace flutter {
 

shell/platform/common/json_method_codec_unittests.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/json_method_codec.h"
+#include "flutter/shell/platform/common/json_method_codec.h"
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
 #include "gtest/gtest.h"
 
 namespace flutter {

shell/platform/common/path_utils.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/path_utils.h"
+#include "flutter/shell/platform/common/path_utils.h"
 
 #if defined(_WIN32)
 #include <windows.h>

shell/platform/common/path_utils_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/path_utils.h"
+#include "flutter/shell/platform/common/path_utils.h"
 
 #include "gtest/gtest.h"
 

shell/platform/common/text_input_model.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/text_input_model.h"
+#include "flutter/shell/platform/common/text_input_model.h"
 
 #include <algorithm>
 #include <codecvt>

shell/platform/common/text_input_model.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "flutter/shell/platform/common/cpp/text_range.h"
+#include "flutter/shell/platform/common/text_range.h"
 
 namespace flutter {
 

shell/platform/common/text_input_model_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/text_input_model.h"
+#include "flutter/shell/platform/common/text_input_model.h"
 
 #include <limits>
 #include <map>

shell/platform/common/text_range_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/cpp/text_range.h"
+#include "flutter/shell/platform/common/text_range.h"
 
 #include "gtest/gtest.h"
 

shell/platform/darwin/macos/BUILD.gn

@@ -102,7 +102,7 @@ source_set("flutter_framework_source") {
     ":macos_gpu_configuration",
     "//flutter/flow:flow",
     "//flutter/fml",
-    "//flutter/shell/platform/common/cpp:common_cpp_switches",
+    "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/darwin/common:framework_shared",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//third_party/skia",

shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "flutter/shell/platform/common/cpp/engine_switches.h"
+#include "flutter/shell/platform/common/engine_switches.h"
 
 static NSString* const kICUBundlePath = @"icudtl.dat";
 static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app";

shell/platform/fuchsia/flutter/BUILD.gn

@@ -111,7 +111,7 @@ template("runner_sources") {
       "//flutter/lib/ui",
       "//flutter/runtime",
       "//flutter/shell/common",
-      "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+      "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     ]
     flutter_deps = [
       ":fuchsia_gpu_configuration",

shell/platform/fuchsia/flutter/platform_view.cc

@@ -15,8 +15,8 @@
 #include "flutter/fml/logging.h"
 #include "flutter/lib/ui/window/pointer_data.h"
 #include "flutter/lib/ui/window/window.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "third_party/rapidjson/include/rapidjson/document.h"
 #include "third_party/rapidjson/include/rapidjson/stringbuffer.h"
 #include "third_party/rapidjson/include/rapidjson/writer.h"

shell/platform/glfw/BUILD.gn

@@ -19,14 +19,13 @@ config("relative_flutter_glfw_headers") {
 source_set("flutter_glfw_headers") {
   public = _public_headers
 
-  public_deps =
-      [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
+  public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
 
   configs +=
-      [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+      [ "//flutter/shell/platform/common:desktop_library_implementation" ]
 
   public_configs =
-      [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ]
+      [ "//flutter/shell/platform/common:relative_flutter_library_headers" ]
 }
 
 source_set("flutter_glfw") {
@@ -51,14 +50,14 @@ source_set("flutter_glfw") {
   ]
 
   configs +=
-      [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+      [ "//flutter/shell/platform/common:desktop_library_implementation" ]
 
   deps = [
     ":flutter_glfw_headers",
     "//build/secondary/third_party/glfw",
-    "//flutter/shell/platform/common/cpp:common_cpp",
-    "//flutter/shell/platform/common/cpp:common_cpp_input",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+    "//flutter/shell/platform/common:common_cpp",
+    "//flutter/shell/platform/common:common_cpp_input",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
     "//third_party/rapidjson",
@@ -96,5 +95,5 @@ copy("publish_headers_glfw") {
   outputs = [ "$root_out_dir/{{source_file_part}}" ]
 
   # The GLFW header assumes the presence of the common headers.
-  deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ]
+  deps = [ "//flutter/shell/platform/common:publish_headers" ]
 }

shell/platform/glfw/client_wrapper/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/shell/platform/common/cpp/client_wrapper/publish.gni")
+import("//flutter/shell/platform/common/client_wrapper/publish.gni")
 import("//flutter/testing/testing.gni")
 
 _wrapper_includes = [
@@ -22,7 +22,7 @@ _wrapper_sources = [
 # header directory of the core wrapper files so these includes will work.
 config("relative_core_wrapper_headers") {
   include_dirs =
-      [ "//flutter/shell/platform/common/cpp/client_wrapper/include/flutter" ]
+      [ "//flutter/shell/platform/common/client_wrapper/include/flutter" ]
 }
 
 # GLFW client wrapper build for internal use by the shell implementation.
@@ -31,17 +31,17 @@ source_set("client_wrapper_glfw") {
   public = _wrapper_includes
 
   deps = [
-    "//flutter/shell/platform/common/cpp:common_cpp_library_headers",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+    "//flutter/shell/platform/common:common_cpp_library_headers",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/glfw:flutter_glfw_headers",
   ]
 
   configs +=
-      [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+      [ "//flutter/shell/platform/common:desktop_library_implementation" ]
 
   public_configs = [
     ":relative_core_wrapper_headers",
-    "//flutter/shell/platform/common/cpp:relative_flutter_library_headers",
+    "//flutter/shell/platform/common:relative_flutter_library_headers",
     "//flutter/shell/platform/glfw:relative_flutter_glfw_headers",
   ]
 }
@@ -85,7 +85,7 @@ executable("client_wrapper_glfw_unittests") {
     ":client_wrapper_glfw",
     ":client_wrapper_glfw_fixtures",
     ":client_wrapper_library_stubs_glfw",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
     "//flutter/testing",
 
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing

shell/platform/glfw/flutter_glfw.cc

@@ -13,9 +13,9 @@
 #include <filesystem>
 #include <iostream>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
-#include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h"
-#include "flutter/shell/platform/common/cpp/path_utils.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
+#include "flutter/shell/platform/common/incoming_message_dispatcher.h"
+#include "flutter/shell/platform/common/path_utils.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/glfw/glfw_event_loop.h"
 #include "flutter/shell/platform/glfw/headless_event_loop.h"

shell/platform/glfw/key_event_handler.cc

@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include "flutter/shell/platform/common/cpp/json_message_codec.h"
+#include "flutter/shell/platform/common/json_message_codec.h"
 
 static constexpr char kChannelName[] = "flutter/keyevent";
 

shell/platform/glfw/key_event_handler.h

@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/glfw/keyboard_hook_handler.h"
 #include "flutter/shell/platform/glfw/public/flutter_glfw.h"
 #include "rapidjson/document.h"

shell/platform/glfw/platform_handler.cc

@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include "flutter/shell/platform/common/cpp/json_method_codec.h"
+#include "flutter/shell/platform/common/json_method_codec.h"
 
 static constexpr char kChannelName[] = "flutter/platform";
 

shell/platform/glfw/platform_handler.h

@@ -7,8 +7,8 @@
 
 #include <GLFW/glfw3.h>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 #include "flutter/shell/platform/glfw/public/flutter_glfw.h"
 #include "rapidjson/document.h"
 

shell/platform/glfw/text_input_plugin.cc

@@ -7,7 +7,7 @@
 #include <cstdint>
 #include <iostream>
 
-#include "flutter/shell/platform/common/cpp/json_method_codec.h"
+#include "flutter/shell/platform/common/json_method_codec.h"
 
 static constexpr char kSetEditingStateMethod[] = "TextInput.setEditingState";
 static constexpr char kClearClientMethod[] = "TextInput.clearClient";

shell/platform/glfw/text_input_plugin.h

@@ -8,9 +8,9 @@
 #include <map>
 #include <memory>
 
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h"
-#include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h"
-#include "flutter/shell/platform/common/cpp/text_input_model.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
+#include "flutter/shell/platform/common/text_input_model.h"
 #include "flutter/shell/platform/glfw/keyboard_hook_handler.h"
 #include "flutter/shell/platform/glfw/public/flutter_glfw.h"
 

shell/platform/linux/BUILD.gn

@@ -127,8 +127,8 @@ source_set("flutter_linux_sources") {
   ]
 
   deps = [
-    "//flutter/shell/platform/common/cpp:common_cpp_input",
-    "//flutter/shell/platform/common/cpp:common_cpp_switches",
+    "//flutter/shell/platform/common:common_cpp_input",
+    "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/embedder:embedder_headers",
     "//third_party/rapidjson",
   ]

shell/platform/linux/fl_dart_project.cc

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "flutter/shell/platform/common/cpp/engine_switches.h"
+#include "flutter/shell/platform/common/engine_switches.h"
 #include "flutter/shell/platform/linux/fl_dart_project_private.h"
 
 struct _FlDartProject {

shell/platform/linux/fl_text_input_plugin.cc

@@ -6,7 +6,7 @@
 
 #include <gtk/gtk.h>
 
-#include "flutter/shell/platform/common/cpp/text_input_model.h"
+#include "flutter/shell/platform/common/text_input_model.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h"
 

shell/platform/windows/BUILD.gn

@@ -26,19 +26,18 @@ config("relative_flutter_windows_headers") {
 source_set("flutter_windows_headers") {
   public = _public_headers
 
-  public_deps =
-      [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
+  public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
 
   if (target_os == "winuwp") {
     configs +=
-        [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+        [ "//flutter/shell/platform/common:desktop_library_implementation" ]
   } else {
     configs +=
-        [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+        [ "//flutter/shell/platform/common:desktop_library_implementation" ]
   }
 
   public_configs =
-      [ "//flutter/shell/platform/common/cpp:relative_flutter_library_headers" ]
+      [ "//flutter/shell/platform/common:relative_flutter_library_headers" ]
 }
 
 source_set("flutter_windows_source") {
@@ -114,7 +113,7 @@ source_set("flutter_windows_source") {
   }
 
   configs += [
-    "//flutter/shell/platform/common/cpp:desktop_library_implementation",
+    "//flutter/shell/platform/common:desktop_library_implementation",
     "//third_party/angle:gl_prototypes",
   ]
 
@@ -127,10 +126,10 @@ source_set("flutter_windows_source") {
 
   deps = [
     ":flutter_windows_headers",
-    "//flutter/shell/platform/common/cpp:common_cpp",
-    "//flutter/shell/platform/common/cpp:common_cpp_input",
-    "//flutter/shell/platform/common/cpp:common_cpp_switches",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+    "//flutter/shell/platform/common:common_cpp",
+    "//flutter/shell/platform/common:common_cpp_input",
+    "//flutter/shell/platform/common:common_cpp_switches",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows",
     "//third_party/angle:libEGL_static",  # the order of libEGL_static and
@@ -148,7 +147,7 @@ copy("publish_headers_windows") {
   outputs = [ "$root_out_dir/{{source_file_part}}" ]
 
   # The Windows header assumes the presence of the common headers.
-  deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ]
+  deps = [ "//flutter/shell/platform/common:publish_headers" ]
 }
 
 shared_library("flutter_windows") {
@@ -213,7 +212,7 @@ executable("flutter_windows_unittests") {
     ":flutter_windows_fixtures",
     ":flutter_windows_headers",
     ":flutter_windows_source",
-    "//flutter/shell/platform/common/cpp:common_cpp",
+    "//flutter/shell/platform/common:common_cpp",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",

shell/platform/windows/client_wrapper/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/shell/platform/common/cpp/client_wrapper/publish.gni")
+import("//flutter/shell/platform/common/client_wrapper/publish.gni")
 import("//flutter/testing/testing.gni")
 
 _wrapper_includes = [
@@ -23,8 +23,8 @@ _wrapper_sources = [
 # directories of the core wrapper files so these includes will work.
 config("relative_core_wrapper_headers") {
   include_dirs = [
-    "//flutter/shell/platform/common/cpp/client_wrapper",
-    "//flutter/shell/platform/common/cpp/client_wrapper/include/flutter",
+    "//flutter/shell/platform/common/client_wrapper",
+    "//flutter/shell/platform/common/client_wrapper/include/flutter",
   ]
 }
 
@@ -34,17 +34,17 @@ source_set("client_wrapper_windows") {
   public = _wrapper_includes
 
   deps = [
-    "//flutter/shell/platform/common/cpp:common_cpp_library_headers",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
+    "//flutter/shell/platform/common:common_cpp_library_headers",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/windows:flutter_windows_headers",
   ]
 
   configs +=
-      [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
+      [ "//flutter/shell/platform/common:desktop_library_implementation" ]
 
   public_configs = [
     ":relative_core_wrapper_headers",
-    "//flutter/shell/platform/common/cpp:relative_flutter_library_headers",
+    "//flutter/shell/platform/common:relative_flutter_library_headers",
     "//flutter/shell/platform/windows:relative_flutter_windows_headers",
   ]
 }
@@ -88,7 +88,7 @@ executable("client_wrapper_windows_unittests") {
     ":client_wrapper_library_stubs_windows",
     ":client_wrapper_windows",
     ":client_wrapper_windows_fixtures",
-    "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_library_stubs",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
     "//flutter/testing",
 
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing