Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/it2me/it2me_host.h

Index: remoting/host/it2me/it2me_host.h
diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h
index c24f2d10d4e6f136f47027888180a9cd35afc276..c12242a46c5ac26756317c052f3fabe5b6dc584c 100644
--- a/remoting/host/it2me/it2me_host.h
+++ b/remoting/host/it2me/it2me_host.h
@@ -123,6 +123,10 @@ class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>,
   // the UI thread.
   void ShutdownOnUiThread();
 
+  // Called when |policy_watcher_| has stopped listening for changes so that it

[Jamie, 2014/10/14 01:18:42]

s/so that/and/

[kelvinp, 2014/10/15 23:03:10]

Done.

+  // safe to delete the |policy_watcher_| object.

[Jamie, 2014/10/14 01:18:42]

s/safe/is safe/

[kelvinp, 2014/10/15 23:03:10]

Done.

+  void OnPolicyWatcherShutdown();
+
   // Called when initial policies are read, and when they change.
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
 
@@ -136,6 +140,7 @@ class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>,
   // responsible for keeping it alive throughout the liftime of the host.
   ChromotingHostContext* host_context_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;

[Jamie, 2014/10/14 01:18:42]

It's not clear to me why this new member is needed. It seems only to be used to
save a call to host_context_->network_task_runner() and it makes what would
otherwise be a very small diff to this file much harder to review.

[kelvinp, 2014/10/15 23:03:10]

The ChromotingHostContext is owned by the It2meNativeMessaginHost and it will be
deleted when It2meNativeMessagingHost is destroyed.  During shutdown, It2meHost
outlives It2meNativeMessagingHost so that I can clean itself up on the
network_task_runner.  We can no longer get the network_task_runner from the
host_context at this point as it is already destroyed.

   base::WeakPtr<It2MeHost::Observer> observer_;
   XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
   std::string directory_bot_jid_;