SharingMessageHandler overrides should override the destructor

Otherwise their own members wouldn't be properly destroyed. Also address
some tiny style nits.

Change-Id: Ia0f08d5d5b972022025e8ca0cc031482fde77b7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1697207
Commit-Queue: Peter Beverloo <peter@chromium.org>
Auto-Submit: Peter Beverloo <peter@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676864}

chrome/browser/sharing/ack_message_handler.cc

@@ -6,6 +6,8 @@
 
 AckMessageHandler::AckMessageHandler() = default;
 
+AckMessageHandler::~AckMessageHandler() = default;
+
 void AckMessageHandler::OnMessage(
     const chrome_browser_sharing::SharingMessage& message) {
   // TODO

chrome/browser/sharing/ack_message_handler.h

@@ -11,7 +11,9 @@
 class AckMessageHandler : public SharingMessageHandler {
  public:
   AckMessageHandler();
+  ~AckMessageHandler() override;
 
+  // SharingMessageHandler implementation:
   void OnMessage(
       const chrome_browser_sharing::SharingMessage& message) override;
 

chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc

@@ -8,8 +8,10 @@
 #include "base/logging.h"
 #include "chrome/android/chrome_jni_headers/ClickToCallMessageHandler_jni.h"
 #include "chrome/browser/sharing/proto/click_to_call_message.pb.h"
+#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 
 ClickToCallMessageHandler::ClickToCallMessageHandler() = default;
+
 ClickToCallMessageHandler::~ClickToCallMessageHandler() = default;
 
 void ClickToCallMessageHandler::OnMessage(

chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h

@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_MESSAGE_HANDLER_ANDROID_H_
 
 #include "base/macros.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_message_handler.h"
 
 // Handles incoming messages for the click to call feature.
@@ -15,7 +14,7 @@ class ClickToCallMessageHandler : public SharingMessageHandler {
   ClickToCallMessageHandler();
   ~ClickToCallMessageHandler() override;
 
-  // SharingMessageHandler
+  // SharingMessageHandler implementation:
   void OnMessage(
       const chrome_browser_sharing::SharingMessage& message) override;
 

chrome/browser/sharing/ping_message_handler.cc

@@ -6,6 +6,8 @@
 
 PingMessageHandler::PingMessageHandler() = default;
 
+PingMessageHandler::~PingMessageHandler() = default;
+
 void PingMessageHandler::OnMessage(
     const chrome_browser_sharing::SharingMessage& message) {
   // TODO

chrome/browser/sharing/ping_message_handler.h

@@ -11,7 +11,9 @@
 class PingMessageHandler : public SharingMessageHandler {
  public:
   PingMessageHandler();
+  ~PingMessageHandler() override;
 
+  // SharingMessageHandler implementation:
   void OnMessage(
       const chrome_browser_sharing::SharingMessage& message) override;
 

chrome/browser/sharing/sharing_fcm_handler_unittest.cc

@@ -25,9 +25,10 @@ const int kAckTimeToLiveMinutes = 30;
 
 class MockSharingMessageHandler : public SharingMessageHandler {
  public:
-  MockSharingMessageHandler() {}
-  ~MockSharingMessageHandler() override {}
+  MockSharingMessageHandler() = default;
+  ~MockSharingMessageHandler() override = default;
 
+  // SharingMessageHandler implementation:
   MOCK_METHOD1(OnMessage, void(const SharingMessage& message));
 };
 

chrome/browser/sharing/sharing_message_handler.h

@@ -5,23 +5,18 @@
 #ifndef CHROME_BROWSER_SHARING_SHARING_MESSAGE_HANDLER_H_
 #define CHROME_BROWSER_SHARING_SHARING_MESSAGE_HANDLER_H_
 
-#include <string>
-
-#include "base/macros.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
+namespace chrome_browser_sharing {
+class SharingMessage;
+}  // namespace chrome_browser_sharing
 
 // Interface for handling incoming SharingMessage.
 class SharingMessageHandler {
  public:
-  SharingMessageHandler() = default;
   virtual ~SharingMessageHandler() = default;
 
   // Called when a SharingMessage has been received.
   virtual void OnMessage(
       const chrome_browser_sharing::SharingMessage& message) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SharingMessageHandler);
 };
 
 #endif  // CHROME_BROWSER_SHARING_SHARING_MESSAGE_HANDLER_H_