Add HostObserverInterface and decouple HeartbeatSender and ChromotingHost.

chrome/service/remoting/chromoting_host_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/remoting/chromoting_host_manager.h"
 
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/remoting/chromoting_host_info.h"
 #include "net/base/net_util.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/chromoting_host_context.h"
+#include "remoting/host/heartbeat_sender.h"
+#include "remoting/host/host_key_pair.h"

[Wez, 2011/05/03 05:21:50]

What's host_key_pair.h used for here?

[Sergey Ulanov, 2011/05/03 17:24:18]

HostKeyPair is used here to generate private key and write it in the config.

 #include "remoting/host/json_host_config.h"
 
 namespace remoting {
 
 ChromotingHostManager::ChromotingHostManager(Observer* observer)
     : observer_(observer),
       main_message_loop_(NULL) {
 }
 
 void ChromotingHostManager::Initialize(
@@ skipping 148 matching lines @@
 
   // Start the chromoting context first.
   chromoting_context_.reset(
       new remoting::ChromotingHostContext(main_message_loop_));
   chromoting_context_->Start();
 
   // Create a chromoting host object.
   chromoting_host_ = remoting::ChromotingHost::Create(chromoting_context_.get(),
                                                       chromoting_config_);
 
+  // Initialize HeartbeatSender.
+  scoped_refptr<remoting::HeartbeatSender> heartbeat_sender =
+      new remoting::HeartbeatSender(chromoting_context_->network_message_loop(),
+                                    chromoting_config_);
+  if (!heartbeat_sender->Init())
+    LOG(ERROR) << "Failed to initialize heartbeat sender.";

[Wez, 2011/05/03 05:21:50]

Surely we even have reached this point if the configuration is invalid (which is
the only reason that Init() can fail, I think)?

[Sergey Ulanov, 2011/05/03 17:24:18]

Yes, normally this will not happen, but it may fail if, for example, somebody
edits config, e.g writes invalid private key in it.

+  chromoting_host_->AddStatusObserver(heartbeat_sender);
+
+
   // Then start the chromoting host.
   // When ChromotingHost is shutdown because of failure or a request that
   // we made OnChromotingShutdown() is calls.
   chromoting_host_->Start(
       NewRunnableMethod(this, &ChromotingHostManager::OnShutdown));
 }
 
 void ChromotingHostManager::OnShutdown() {
   if (MessageLoop::current() != main_message_loop_) {
     main_message_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(this, &ChromotingHostManager::OnShutdown));
     return;
   }
   chromoting_context_->Stop();
   chromoting_context_.reset();
   chromoting_host_ = NULL;
 
   if (shutdown_task_.get()) {
     shutdown_task_->Run();
     shutdown_task_.reset();
   }
 }
 
 }  // namespace remoting