Revert "[windows] Expose the binary messenger from FlutterEngine (flutter#20399)" (flutter#20550)

This reverts commit 7fa21a4.

Author: stuartmorgan-g

ci/licenses_golden/licenses_flutter

@@ -836,9 +836,7 @@ 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/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

shell/platform/common/cpp/client_wrapper/BUILD.gn

@@ -8,8 +8,7 @@ import("core_wrapper_files.gni")
 # Client library build for internal use by the shell implementation.
 source_set("client_wrapper") {
   sources = core_cpp_client_wrapper_sources
-  public = core_cpp_client_wrapper_includes +
-           core_cpp_client_wrapper_internal_headers
+  public = core_cpp_client_wrapper_includes
 
   deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
 

shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h

@@ -27,26 +27,13 @@ core_cpp_client_wrapper_includes =
                   ],
                   "abspath")
 
-# Headers that aren't public for clients of the wrapper, but are considered
-# public for the purpose of BUILD dependencies (e.g., to allow
-# windows/client_wrapper implementation files to include them).
-core_cpp_client_wrapper_internal_headers =
-    get_path_info([
-                    "binary_messenger_impl.h",
-                    "byte_buffer_streams.h",
-                  ],
-                  "abspath")
-
 # TODO: Once the wrapper API is more stable, consolidate to as few files as is
 # reasonable (without forcing different kinds of clients to take unnecessary
 # code) to simplify use.
 core_cpp_client_wrapper_sources = get_path_info([
-                                                  "core_implementations.cc",
+                                                  "byte_buffer_streams.h",
+                                                  "engine_method_result.cc",
                                                   "plugin_registrar.cc",
                                                   "standard_codec.cc",
                                                 ],
                                                 "abspath")
-
-# Temporary shim, published for backwards compatibility.
-# See comment in the file for more detail.
-temporary_shim_files = get_path_info([ "engine_method_result.cc" ], "abspath")

shell/platform/common/cpp/client_wrapper/core_implementations.cc

@@ -2,10 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is deprecated in favor of core_implementations.cc. This is a
-// temporary forwarding implementation so that the switch to
-// core_implementations.cc isn't an immediate breaking change, allowing for the
-// template to be updated to include it and update the template version before
-// removing this file.
+#include "include/flutter/engine_method_result.h"
 
-#include "core_implementations.cc"
+#include <assert.h>
+#include <iostream>
+
+namespace flutter {
+namespace internal {
+
+ReplyManager::ReplyManager(BinaryReply reply_handler)
+    : reply_handler_(std::move(reply_handler)) {
+  assert(reply_handler_);
+}
+
+ReplyManager::~ReplyManager() {
+  if (reply_handler_) {
+    // Warn, rather than send a not-implemented response, since the engine may
+    // no longer be valid at this point.
+    std::cerr
+        << "Warning: Failed to respond to a message. This is a memory leak."
+        << std::endl;
+  }
+}
+
+void ReplyManager::SendResponseData(const std::vector<uint8_t>* data) {
+  if (!reply_handler_) {
+    std::cerr
+        << "Error: Only one of Success, Error, or NotImplemented can be "
+           "called,"
+        << " and it can be called exactly once. Ignoring duplicate result."
+        << std::endl;
+    return;
+  }
+
+  const uint8_t* message = data && !data->empty() ? data->data() : nullptr;
+  size_t message_size = data ? data->size() : 0;
+  reply_handler_(message, message_size);
+  reply_handler_ = nullptr;
+}
+
+}  // namespace internal
+}  // namespace flutter