Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/it2me/it2me_host.h

 // Copyright 2013 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.
 
 #ifndef REMOTING_HOST_IT2ME_IT2ME_HOST_H_
 #define REMOTING_HOST_IT2ME_IT2ME_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 105 matching lines @@
                            const base::TimeDelta& lifetime);
 
   // Shuts down |host_| on the network thread and posts ShutdownOnUiThread()
   // to shut down UI thread resources.
   void ShutdownOnNetworkThread();
 
   // Shuts down |desktop_environment_factory_| and |policy_watcher_| on
   // 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);
 
   // Handlers for NAT traversal and host domain policies.
   void UpdateNatPolicy(bool nat_traversal_enabled);
   void UpdateHostDomainPolicy(const std::string& host_domain);
 
   // Caller supplied fields.
 
   // The creator of the It2MeHost object owns the the host context and is
   // 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_;
 
   It2MeHostState state_;
 
   scoped_refptr<RsaKeyPair> host_key_pair_;
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<RegisterSupportHostRequest> register_request_;
   scoped_ptr<HostStatusLogger> host_status_logger_;
@@ skipping 39 matching lines @@
       const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
       const std::string& directory_bot_jid);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(It2MeHostFactory);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_IT2ME_IT2ME_HOST_H_