Remove key exchange code from JingleSession.

remoting/protocol/jingle_session_manager.cc

 // 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.
 
 #include "remoting/protocol/jingle_session_manager.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 158 matching lines @@
 
   cricket::Session* cricket_session = cricket_session_manager_->CreateSession(
       local_jid_, kChromotingXmlNamespace);
 
   // Initialize connection object before we send initiate stanza.
   jingle_session->SetStateChangeCallback(state_change_callback);
   jingle_session->Init(cricket_session);
   sessions_.push_back(jingle_session);
 
   cricket_session->Initiate(host_jid, CreateClientSessionDescription(
-      jingle_session->candidate_config()->Clone(), receiver_token,
-      jingle_session->GetEncryptedMasterKey()));
+      jingle_session->candidate_config()->Clone(), receiver_token));
 
   return jingle_session;
 }
 
 void JingleSessionManager::OnSessionCreate(
     cricket::Session* cricket_session, bool incoming) {
   DCHECK(CalledOnValidThread());
 
   // Allow local connections if neccessary.
   cricket_session->set_allow_local_ips(allow_local_ips_);
@@ skipping 134 matching lines @@
       static_cast<const ContentDescription*>(content);
 
   *elem = desc->ToXml();
   return true;
 }
 
 // static
 cricket::SessionDescription*
 JingleSessionManager::CreateClientSessionDescription(
     const CandidateSessionConfig* config,
-    const std::string& auth_token,
-    const std::string& master_key) {
+    const std::string& auth_token) {
   cricket::SessionDescription* desc = new cricket::SessionDescription();
   desc->AddContent(
       JingleSession::kChromotingContentName, kChromotingXmlNamespace,
-      new ContentDescription(config, auth_token, master_key, ""));
+      new ContentDescription(config, auth_token, ""));
   return desc;
 }
 
 // static
 cricket::SessionDescription* JingleSessionManager::CreateHostSessionDescription(
     const CandidateSessionConfig* config,
     const std::string& certificate) {
   cricket::SessionDescription* desc = new cricket::SessionDescription();
   desc->AddContent(
       JingleSession::kChromotingContentName, kChromotingXmlNamespace,
-      new ContentDescription(config, "", "", certificate));
+      new ContentDescription(config, "", certificate));
   return desc;
 }
 
 }  // namespace protocol
 }  // namespace remoting