Cleanups in ChromotingClient

remoting/ios/bridge/client_instance.h

 // Copyright 2014 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_IOS_BRIDGE_CLIENT_INSTANCE_H_
 #define REMOTING_IOS_BRIDGE_CLIENT_INSTANCE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/client/chromoting_client.h"
-#include "remoting/client/client_config.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/software_video_renderer.h"
 
 #include "remoting/ios/bridge/frame_consumer_bridge.h"
 
 #include "remoting/jingle_glue/network_settings.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/clipboard_stub.h"
-#include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 
 namespace remoting {
 
 class ClientProxy;
 
 // ClientUserInterface that indirectly makes and receives OBJ_C calls from the
 // UI application
 class ClientInstance : public ClientUserInterface,
                        public protocol::ClipboardStub,
@@ skipping 48 matching lines @@
   virtual void OnConnectionReady(bool ready) OVERRIDE;
   virtual void OnRouteChanged(const std::string& channel_name,
                               const protocol::TransportRoute& route) OVERRIDE;
   virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
   virtual void SetPairingResponse(const protocol::PairingResponse& response)
       OVERRIDE;
   virtual void DeliverHostMessage(const protocol::ExtensionMessage& message)
       OVERRIDE;
   virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
   virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
-  virtual scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
-      GetTokenFetcher(const std::string& host_public_key) OVERRIDE;
 
   // CursorShapeStub implementation.
   virtual void InjectClipboardEvent(const protocol::ClipboardEvent& event)
       OVERRIDE;
 
   // ClipboardStub implementation.
   virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) OVERRIDE;
 
  private:
   // This object is ref-counted, so it cleans itself up.
   virtual ~ClientInstance();
 
   void ConnectToHostOnNetworkThread(
       scoped_refptr<FrameConsumerProxy> consumer_proxy,
       const base::Closure& done);
   void DisconnectFromHostOnNetworkThread(const base::Closure& done);
 
   // Proxy to exchange messages between the
   // common Chromoting protocol and UI Application.
   base::WeakPtr<ClientProxy> proxyToClient_;
 
   // ID of the host we are connecting to.
   std::string host_id_;
+  std::string host_jid_;
 
   // This group of variables is to be used on the display thread.
   scoped_ptr<SoftwareVideoRenderer> video_renderer_;
   scoped_ptr<FrameConsumerBridge> view_;
 
   // This group of variables is to be used on the network thread.
-  ClientConfig client_config_;
   scoped_ptr<ClientContext> client_context_;
-  scoped_ptr<protocol::ConnectionToHost> connection_;
+  scoped_ptr<protocol::Authenticator> authenticator_;
   scoped_ptr<ChromotingClient> client_;
   XmppSignalStrategy::XmppServerConfig xmpp_config_;
   scoped_ptr<XmppSignalStrategy> signaling_;  // Must outlive client_
 
   // Pass this the user's PIN once we have it. To be assigned and accessed on
   // the UI thread, but must be posted to the network thread to call it.
   protocol::SecretFetchedCallback pin_callback_;
 
   // Indicates whether to establish a new pairing with this host. This is
   // modified in ProvideSecret(), but thereafter to be used only from the
@@ skipping 14 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> url_requester_;
 
   friend class base::RefCountedThreadSafe<ClientInstance>;
 
   DISALLOW_COPY_AND_ASSIGN(ClientInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_IOS_BRIDGE_CLIENT_INSTANCE_H_