Remove original_message_type from Sharing AckMessage
This field was only used to collect metrics, however, we can actually
just store that information on the sender side and avoid sending it back
via FCM.
We never used the suffixed version of Sharing.MessageReceivedType so
this also removes that while keeping the aggregate one.
Bug: None
Change-Id: Ie598d33e60381341170bbca2716cb70be09be0e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000764
Reviewed-by: Alexei Svitkine <[email protected]>
Reviewed-by: Michael van Ouwerkerk <[email protected]>
Commit-Queue: Richard Knoll <[email protected]>
Cr-Commit-Position: refs/heads/master@{#732025}
diff --git a/chrome/browser/sharing/ack_message_handler_unittest.cc b/chrome/browser/sharing/ack_message_handler_unittest.cc
index 9d937da..2e8b832 100644
--- a/chrome/browser/sharing/ack_message_handler_unittest.cc
+++ b/chrome/browser/sharing/ack_message_handler_unittest.cc
@@ -24,10 +24,9 @@
/*local_device_info_provider=*/nullptr) {}
~MockSharingMessageSender() override = default;
- MOCK_METHOD3(
+ MOCK_METHOD2(
OnAckReceived,
- void(chrome_browser_sharing::MessageType message_type,
- const std::string& fcm_message_id,
+ void(const std::string& fcm_message_id,
std::unique_ptr<chrome_browser_sharing::ResponseMessage> response));
private:
@@ -59,16 +58,12 @@
chrome_browser_sharing::SharingMessage sharing_message;
sharing_message.mutable_ack_message()->set_original_message_id(
kTestMessageId);
- sharing_message.mutable_ack_message()->set_original_message_type(
- chrome_browser_sharing::CLICK_TO_CALL_MESSAGE);
base::MockCallback<SharingMessageHandler::DoneCallback> done_callback;
EXPECT_CALL(done_callback, Run(testing::Eq(nullptr)));
- EXPECT_CALL(
- mock_response_callback_helper_,
- OnAckReceived(testing::Eq(chrome_browser_sharing::CLICK_TO_CALL_MESSAGE),
- testing::Eq(kTestMessageId), testing::Eq(nullptr)));
+ EXPECT_CALL(mock_response_callback_helper_,
+ OnAckReceived(testing::Eq(kTestMessageId), testing::Eq(nullptr)));
ack_message_handler_.OnMessage(std::move(sharing_message),
done_callback.Get());
@@ -78,8 +73,6 @@
chrome_browser_sharing::SharingMessage sharing_message;
sharing_message.mutable_ack_message()->set_original_message_id(
kTestMessageId);
- sharing_message.mutable_ack_message()->set_original_message_type(
- chrome_browser_sharing::CLICK_TO_CALL_MESSAGE);
sharing_message.mutable_ack_message()->mutable_response_message();
chrome_browser_sharing::ResponseMessage response_message_copy =
@@ -88,11 +81,9 @@
base::MockCallback<SharingMessageHandler::DoneCallback> done_callback;
EXPECT_CALL(done_callback, Run(testing::Eq(nullptr)));
- EXPECT_CALL(
- mock_response_callback_helper_,
- OnAckReceived(testing::Eq(chrome_browser_sharing::CLICK_TO_CALL_MESSAGE),
- testing::Eq(kTestMessageId),
- ProtoEquals(response_message_copy)));
+ EXPECT_CALL(mock_response_callback_helper_,
+ OnAckReceived(testing::Eq(kTestMessageId),
+ ProtoEquals(response_message_copy)));
ack_message_handler_.OnMessage(std::move(sharing_message),
done_callback.Get());
