Fix feedback

Author: a-maurice

messaging/integration_test/src/integration_test.cc

@@ -564,9 +564,6 @@ TEST_F(FirebaseMessagingTest, TestRegisterAndUnregister) {
 
   // Note that these methods should only work if the newer registration
   // method is enabled. Otherwise, it returns an error.
-  int expected_error =
-      is_new_registration_id_ ? 0 : firebase::messaging::kErrorUnknown;
-
   if (is_new_registration_id_) {
     firebase::Future<void> reg_future = firebase::messaging::Register();
     EXPECT_TRUE(WaitForCompletion(reg_future, "Register"));

messaging/src/common.cc

@@ -17,6 +17,7 @@
 #include <assert.h>
 
 #include <queue>
+#include <string>
 
 #include "app/src/cleanup_notifier.h"
 #include "app/src/include/firebase/internal/common.h"

messaging/src/include/firebase/messaging.h

@@ -730,22 +730,22 @@ class PollableListener : public Listener {
 
   /// @brief An implementation of `OnMessage` which adds incoming messages
   /// to a queue, which can be consumed by calling `PollMessage`.
-  virtual void OnMessage(const Message& message) override;
+  void OnMessage(const Message& message) override;
 
   /// @brief An implementation of `OnTokenReceived` which stores the incoming
   /// token so that it can be consumed by calling `PollRegistrationToken`.
   /// @deprecated Use OnRegistrationReceived(const char*) instead.
-  FIREBASE_DEPRECATED virtual void OnTokenReceived(const char* token) override;
+  FIREBASE_DEPRECATED void OnTokenReceived(const char* token) override;
 
   /// @brief An implementation of `OnRegistrationReceived` which stores the
   /// incoming installation ID so that it can be consumed by calling
   /// `PollRegistration`.
-  virtual void OnRegistrationReceived(const char* installationId) override;
+  void OnRegistrationReceived(const char* installationId) override;
 
   /// @brief An implementation of `OnUnregistrationReceived` which stores the
   /// incoming installation ID so that it can be consumed by calling
   /// `PollUnregistration`.
-  virtual void OnUnregistrationReceived(const char* installationId) override;
+  void OnUnregistrationReceived(const char* installationId) override;
 
   /// @brief Returns the first message queued up, if any.
   ///

messaging/tests/messaging_test.cc

@@ -476,16 +476,6 @@ TEST_F(MessagingTest, TestTwoRegistrationsReceivedAfterInitialize) {
   EXPECT_EQ(listener_.GetOnRegistrationReceivedCount(), 2);
 }
 
-TEST_F(MessagingTest, TestUnregistrationClearsCachedRegistration) {
-  Terminate();
-  OnRegistrationReceived("my_installation_id");
-  OnUnregistrationReceived("my_installation_id");
-  EXPECT_EQ(Initialize(*firebase_app_, &listener_), kInitResultSuccess);
-  SleepMessagingTest(1);
-  EXPECT_THAT(listener_.GetRegistrationId(), StrEq(""));
-  EXPECT_THAT(listener_.GetUnregistrationId(), StrEq("my_installation_id"));
-}
-
 #endif  // defined(FIREBASE_ANDROID_FOR_DESKTOP)
 
 }  // namespace messaging