Reporting of policy errors via host-offline-reason: part 2b

remoting/host/remoting_me2me_host.cc

Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index e83a4847a97d0fd5d4bcf76b5927b98ba533a5a4..d4a9d8702e517aeeafc358c3680b3728d99bfffc 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -142,7 +142,6 @@ namespace remoting {
 
 class HostProcess
     : public ConfigWatcher::Delegate,
-      public HeartbeatSender::Listener,
       public HostChangeNotificationListener::Listener,
       public IPC::Listener,
       public base::RefCountedThreadSafe<HostProcess> {
@@ -158,10 +157,6 @@ class HostProcess
   virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void OnChannelError() override;
 
-  // HeartbeatSender::Listener overrides.
-  virtual void OnHeartbeatSuccessful() override;
-  virtual void OnUnknownHostIdError() override;
-
   // HostChangeNotificationListener::Listener overrides.
   virtual void OnHostDeleted() override;
 
@@ -249,6 +244,9 @@ class HostProcess
 
   void StartHost();
 
+  void OnHeartbeatSuccessful();
+  void OnUnknownHostIdError();
+
   void OnAuthFailed();
 
   void RestartHost();
@@ -1322,8 +1320,9 @@ void HostProcess::StartHost() {
 #endif
 
   heartbeat_sender_.reset(new HeartbeatSender(
-      this, host_id_, signal_strategy_.get(), key_pair_,
-      directory_bot_jid_));
+      base::Bind(&HostProcess::OnHeartbeatSuccessful, base::Unretained(this)),
+      base::Bind(&HostProcess::OnUnknownHostIdError, base::Unretained(this)),
+      host_id_, signal_strategy_.get(), key_pair_, directory_bot_jid_));
 
   host_change_notification_listener_.reset(new HostChangeNotificationListener(
       this, host_id_, signal_strategy_.get(), directory_bot_jid_));