Remove key exchange code from JingleSession.

remoting/protocol/jingle_session.h

 // Copyright (c) 2011 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_PROTOCOL_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/task.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 62 matching lines @@
   JingleSession(JingleSessionManager* jingle_session_manager,
                 const std::string& local_cert,
                 crypto::RSAPrivateKey* local_private_key,
                 const std::string& peer_public_key);
   virtual ~JingleSession();
 
   // Called by JingleSessionManager.
   void set_candidate_config(const CandidateSessionConfig* candidate_config);
   const std::string& local_certificate() const;
   void Init(cricket::Session* cricket_session);
-  std::string GetEncryptedMasterKey() const;
 
   // Close all the channels and terminate the session.
   void CloseInternal(int result, bool failed);
 
   bool HasSession(cricket::Session* cricket_session);
   cricket::Session* ReleaseSession();
 
   // Initialize the session configuration from a received connection response
   // stanza.
   bool InitializeConfigFromDescription(
@@ skipping 45 matching lines @@
   // has a certificate.
   std::string local_cert_;
   std::string remote_cert_;
 
   // Private key used in SSL server sockets.
   scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
 
   // Public key of the peer.
   std::string peer_public_key_;
 
-  // Master key used to derive ice keys for each ice
-  // session. Generated on the client and sent to the host in the
-  // session-initiate message (encrypted with the host's key).
-  std::string master_key_;
-
   // Shared secret to use in channel authentication.  This is currently only
   // used in IT2Me.
   std::string shared_secret_;
 
   State state_;
   scoped_ptr<StateChangeCallback> state_change_callback_;
 
   bool closed_;
   bool closing_;
 
@@ skipping 21 matching lines @@
   ScopedRunnableMethodFactory<JingleSession> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_