[Cast Streaming] Messager -> Messenger

Messager, while being proper English, is archaic and generally not in
use. This patch updates SessionMessager and its related types to be
named SessionMessenger.

Change-Id: I8d9caa685f86fa5863db56b4514a4d16ed5f1a33
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2950433
Reviewed-by: Ryan Keane <rwkeane@google.com>
Commit-Queue: Jordan Bayles <jophba@chromium.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/cast/streaming/sender_session.cc b/cast/streaming/sender_session.cc
index 866afe5a..ca5ce027 100644
--- a/cast/streaming/sender_session.cc
+++ b/cast/streaming/sender_session.cc
@@ -201,7 +201,7 @@ SenderSession::Client::~Client() = default;
 
 SenderSession::SenderSession(Configuration config)
     : config_(config),
-      messager_(
+      messenger_(
           config_.message_port,
           config_.message_source_id,
           config_.message_destination_id,
@@ -217,10 +217,10 @@ SenderSession::SenderSession(Configuration config)
   // We may or may not do remoting this session, however our RPC handler
   // is not negotiation-specific and registering on construction here allows us
   // to record any unexpected RPC messages.
-  messager_.SetHandler(ReceiverMessage::Type::kRpc,
-                       [this](ReceiverMessage message) {
-                         this->OnRpcMessage(std::move(message));
-                       });
+  messenger_.SetHandler(ReceiverMessage::Type::kRpc,
+                        [this](ReceiverMessage message) {
+                          this->OnRpcMessage(std::move(message));
+                        });
 }
 
 SenderSession::~SenderSession() = default;
@@ -276,7 +276,7 @@ Error SenderSession::StartNegotiation(
       std::unique_ptr<InProcessNegotiation>(new InProcessNegotiation{
           offer, std::move(audio_configs), std::move(video_configs)});
 
-  return messager_.SendRequest(
+  return messenger_.SendRequest(
       SenderMessage{SenderMessage::Type::kOffer, ++current_sequence_number_,
                     true, std::move(offer)},
       ReceiverMessage::Type::kAnswer,
@@ -310,7 +310,7 @@ void SenderSession::OnAnswer(ReceiverMessage message) {
     // receiver's capabilities are. So, we cache the Answer until the
     // capabilites request is completed.
     current_negotiation_->answer = answer;
-    const Error result = messager_.SendRequest(
+    const Error result = messenger_.SendRequest(
         SenderMessage{SenderMessage::Type::kGetCapabilities,
                       ++current_sequence_number_, true},
         ReceiverMessage::Type::kCapabilitiesResponse,
@@ -362,7 +362,7 @@ void SenderSession::OnCapabilitiesResponse(ReceiverMessage message) {
     return;
   }
   broker_ = std::make_unique<RpcBroker>([this](std::vector<uint8_t> message) {
-    Error error = this->messager_.SendOutboundMessage(SenderMessage{
+    Error error = this->messenger_.SendOutboundMessage(SenderMessage{
         SenderMessage::Type::kRpc, ++(this->current_sequence_number_), true,
         std::move(message)});