2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/service/remoting/chromoting_host_manager.cc b/chrome/service/remoting/chromoting_host_manager.cc
index 1fb369f..aaffdac 100644
--- a/chrome/service/remoting/chromoting_host_manager.cc
+++ b/chrome/service/remoting/chromoting_host_manager.cc
@@ -46,6 +46,8 @@ void ChromotingHostManager::Teardown() {
   Stop();
 }
 
+ChromotingHostManager::~ChromotingHostManager() {}
+
 bool ChromotingHostManager::IsConfigInitialized() {
   std::string host_id;
   if (!chromoting_config_->GetString(remoting::kHostIdConfigPath, &host_id))
diff --git a/chrome/service/remoting/chromoting_host_manager.h b/chrome/service/remoting/chromoting_host_manager.h
index 6c510e8..b64bfe9 100644
--- a/chrome/service/remoting/chromoting_host_manager.h
+++ b/chrome/service/remoting/chromoting_host_manager.h
@@ -38,7 +38,7 @@ class ChromotingHostManager
 
   // Caller keeps ownership of |observer|. |observer| must not be
   // destroyed while this object exists.
-  ChromotingHostManager(Observer* observer);
+  explicit ChromotingHostManager(Observer* observer);
 
   void Initialize(base::MessageLoopProxy* file_message_loop);
   void Teardown();
@@ -60,6 +60,9 @@ class ChromotingHostManager
   void GetHostInfo(ChromotingHostInfo* host_info);
 
  private:
+  friend class base::RefCountedThreadSafe<ChromotingHostManager>;
+  virtual ~ChromotingHostManager();
+
   bool IsConfigInitialized();
   void InitializeConfig();