Simplify It2Me host shutdown

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 24 matching lines @@
 class RsaKeyPair;
 
 // These state values are duplicated in host_session.js. Remember to update
 // both copies when making changes.
 enum It2MeHostState {
   kDisconnected,
   kStarting,
   kRequestedAccessCode,
   kReceivedAccessCode,
   kConnected,
-  kDisconnecting,
   kError,
   kInvalidDomainError
 };
 
 // Internal implementation of the plugin's It2Me host function.
 class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>,
                   public HostStatusObserver {
  public:
   class Observer {
    public:
@@ skipping 11 matching lines @@
       scoped_ptr<It2MeConfirmationDialogFactory> confirmation_dialog_factory,
       base::WeakPtr<It2MeHost::Observer> observer,
       const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
       const std::string& directory_bot_jid);
 
   // Methods called by the script object, from the plugin thread.
 
   // Creates It2Me host structures and starts the host.
   virtual void Connect();
 
   // Disconnects the host, ready for tear-down.

[Lambros, 2015/11/23 22:44:48]

Disconnects and shuts down the host?

[Sergey Ulanov, 2015/11/23 22:59:44]

Done.

   // Also called internally, from the network thread.

[Lambros, 2015/11/23 22:44:48]

Remove this comment, now that it's only called from the main thread.

[Sergey Ulanov, 2015/11/23 22:59:44]

removed this line.

   virtual void Disconnect();
 
   // TODO (weitaosu): Remove RequestNatPolicy from It2MeHost.
   // Request a NAT policy notification.
   virtual void RequestNatPolicy();
 
   // remoting::HostStatusObserver implementation.
   void OnAccessDenied(const std::string& jid) override;
-  void OnClientAuthenticated(const std::string& jid) override;
+  void OnClientConnected(const std::string& jid) override;
   void OnClientDisconnected(const std::string& jid) override;
 
   void SetStateForTesting(It2MeHostState state,
                           const std::string& error_message) {
     SetState(state, error_message);
   }
 
  protected:
   friend class base::RefCountedThreadSafe<It2MeHost>;
 
@@ skipping 23 matching lines @@
   void ReadPolicyAndConnect();
 
   // Called by ReadPolicyAndConnect once policies have been read.
   void FinishConnect();
 
   // Called when the support host registration completes.
   void OnReceivedSupportID(const std::string& support_id,
                            const base::TimeDelta& lifetime,
                            const std::string& error_message);
 
-  // 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 initial policies are read, and when they change.
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
 
   // Called when malformed policies are detected.
   void OnPolicyError();
 
   // Handlers for NAT traversal and host domain policies.
   void UpdateNatPolicy(bool nat_traversal_enabled);
   void UpdateHostDomainPolicy(const std::string& host_domain);
 
+  void Shutdown();
+
   // Caller supplied fields.
   scoped_ptr<ChromotingHostContext> host_context_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::WeakPtr<It2MeHost::Observer> observer_;
   XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
   std::string directory_bot_jid_;
 
   It2MeHostState state_;
 
   scoped_refptr<RsaKeyPair> host_key_pair_;
@@ skipping 51 matching lines @@
       const std::string& directory_bot_jid);
 
  private:
   policy::PolicyService* policy_service_;
   DISALLOW_COPY_AND_ASSIGN(It2MeHostFactory);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_IT2ME_IT2ME_HOST_H_