Revert moving of channel override

Author: gspencergoog

shell/platform/linux/fl_engine.cc

@@ -27,10 +27,6 @@ struct _FlEngine {
   FlDartProject* project;
   FlRenderer* renderer;
   FlBinaryMessenger* binary_messenger;
-
-  // The channel to use if overriding the message channel.
-  GString* channel_override = nullptr;
-
   FlutterEngineAOTData aot_data;
   FLUTTER_API_SYMBOL(FlutterEngine) engine;
 
@@ -293,10 +289,6 @@ static void fl_engine_dispose(GObject* object) {
     self->aot_data = nullptr;
   }
 
-  if (self->channel_override != nullptr) {
-    g_string_free(self->channel_override, true);
-  }
-
   g_clear_object(&self->project);
   g_clear_object(&self->renderer);
   g_clear_object(&self->binary_messenger);
@@ -317,8 +309,8 @@ static void fl_engine_class_init(FlEngineClass* klass) {
 
 static void fl_engine_init(FlEngine* self) {
   self->thread = g_thread_self();
+
   self->binary_messenger = fl_binary_messenger_new(self);
-  self->channel_override = g_string_new(nullptr);
 }
 
 FlEngine* fl_engine_new(FlDartProject* project, FlRenderer* renderer) {
@@ -336,14 +328,6 @@ G_MODULE_EXPORT FlEngine* fl_engine_new_headless(FlDartProject* project) {
   return fl_engine_new(project, FL_RENDERER(renderer));
 }
 
-FlEngine* fl_engine_new_channel_override(FlDartProject* project,
-                                         FlRenderer* renderer,
-                                         const gchar* channel_override) {
-  FlEngine* engine = fl_engine_new(project, renderer);
-  g_string_assign(engine->channel_override, channel_override);
-  return engine;
-}
-
 gboolean fl_engine_start(FlEngine* self, GError** error) {
   g_return_val_if_fail(FL_IS_ENGINE(self), FALSE);
 
@@ -508,11 +492,7 @@ void fl_engine_send_platform_message(FlEngine* self,
 
   FlutterPlatformMessage fl_message = {};
   fl_message.struct_size = sizeof(fl_message);
-  if (self->channel_override != nullptr) {
-    fl_message.channel = self->channel_override->str;
-  } else {
-    fl_message.channel = channel;
-  }
+  fl_message.channel = channel;
   fl_message.message =
       message != nullptr
           ? static_cast<const uint8_t*>(g_bytes_get_data(message, nullptr))

shell/platform/linux/fl_engine_private.h

@@ -55,23 +55,6 @@ typedef gboolean (*FlEnginePlatformMessageHandler)(
  */
 FlEngine* fl_engine_new(FlDartProject* project, FlRenderer* renderer);
 
-/**
- * fl_engine_new_channel_override:
- * @project: an #FlDartProject.
- * @renderer: an #FlRenderer for the engine to use.
- * @channel_override: a channel to use for all communication, in place of the
- * normal message handler channel for all messages. Generally used to override
- * message handler channels in a test.
- *
- * Creates a new Flutter engine which sends all message channel communication
- * over the given channel override. This is useful for tests to be able to (for
- * instance) give "test/echo" as a test channel to receive all communication
- * from the engine.
- */
-FlEngine* fl_engine_new_channel_override(FlDartProject* project,
-                                         FlRenderer* renderer,
-                                         const gchar* channel_override);
-
 /**
  * fl_engine_set_platform_message_handler:
  * @engine: an #FlEngine.

shell/platform/linux/fl_key_event_plugin.cc

@@ -43,17 +43,18 @@ static void fl_key_event_plugin_class_init(FlKeyEventPluginClass* klass) {
 
 static void fl_key_event_plugin_init(FlKeyEventPlugin* self) {}
 
-FlKeyEventPlugin* fl_key_event_plugin_new(
-    FlBinaryMessenger* messenger,
-    GAsyncReadyCallback response_callback) {
+FlKeyEventPlugin* fl_key_event_plugin_new(FlBinaryMessenger* messenger,
+                                          GAsyncReadyCallback response_callback,
+                                          const char* channel_name) {
   g_return_val_if_fail(FL_IS_BINARY_MESSENGER(messenger), nullptr);
 
   FlKeyEventPlugin* self = FL_KEY_EVENT_PLUGIN(
       g_object_new(fl_key_event_plugin_get_type(), nullptr));
 
   g_autoptr(FlJsonMessageCodec) codec = fl_json_message_codec_new();
-  self->channel = fl_basic_message_channel_new(messenger, kChannelName,
-                                               FL_MESSAGE_CODEC(codec));
+  self->channel = fl_basic_message_channel_new(
+      messenger, channel_name == nullptr ? kChannelName : channel_name,
+      FL_MESSAGE_CODEC(codec));
   self->response_callback = response_callback;
 
   return self;

shell/platform/linux/fl_key_event_plugin.h

@@ -41,7 +41,8 @@ G_DECLARE_FINAL_TYPE(FlKeyEventPlugin,
  */
 FlKeyEventPlugin* fl_key_event_plugin_new(
     FlBinaryMessenger* messenger,
-    GAsyncReadyCallback response_callback = nullptr);
+    GAsyncReadyCallback response_callback = nullptr,
+    const char* channel_name = nullptr);
 
 /**
  * fl_key_event_plugin_send_key_event:

shell/platform/linux/fl_key_event_plugin_test.cc

@@ -17,8 +17,10 @@
 static FlEngine* make_mock_engine() {
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   g_autoptr(FlMockRenderer) renderer = fl_mock_renderer_new();
-  g_autoptr(FlEngine) engine = fl_engine_new_channel_override(
-      project, FL_RENDERER(renderer), "test/echo");
+  g_autoptr(GError) renderer_error = nullptr;
+  EXPECT_TRUE(fl_renderer_setup(FL_RENDERER(renderer), &renderer_error));
+  EXPECT_EQ(renderer_error, nullptr);
+  g_autoptr(FlEngine) engine = fl_engine_new(project, FL_RENDERER(renderer));
   g_autoptr(GError) engine_error = nullptr;
   EXPECT_TRUE(fl_engine_start(engine, &engine_error));
   EXPECT_EQ(engine_error, nullptr);
@@ -50,7 +52,7 @@ TEST(FlKeyEventPluginTest, SendKeyEvent) {
   g_autoptr(FlEngine) engine = make_mock_engine();
   FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
   g_autoptr(FlKeyEventPlugin) plugin =
-      fl_key_event_plugin_new(messenger, echo_response_cb);
+      fl_key_event_plugin_new(messenger, echo_response_cb, "test/echo");
 
   char string[] = "A";
   GdkEventKey key_event = GdkEventKey{
@@ -106,7 +108,7 @@ void test_lock_event(guint key_code,
   g_autoptr(FlEngine) engine = make_mock_engine();
   FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
   g_autoptr(FlKeyEventPlugin) plugin =
-      fl_key_event_plugin_new(messenger, echo_response_cb);
+      fl_key_event_plugin_new(messenger, echo_response_cb, "test/echo");
 
   GdkEventKey key_event = GdkEventKey{
       GDK_KEY_PRESS,  // event type