diff options
author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:34:23 +0000 |
---|---|---|
committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:34:23 +0000 |
commit | c3ddba29664d91b8910489150171496b28355bbb (patch) | |
tree | 7b0273861652a98310037d074041d40dfbd6fbca /remoting/protocol/protocol_test_client.cc | |
parent | 5000ade63130b45452cb1d0d67d1f92e77c3436f (diff) | |
download | chromium_src-c3ddba29664d91b8910489150171496b28355bbb.zip chromium_src-c3ddba29664d91b8910489150171496b28355bbb.tar.gz chromium_src-c3ddba29664d91b8910489150171496b28355bbb.tar.bz2 |
Chromoting: Rename ChromotocolConfig -> SessionConfig
BUG=none
TEST=build chrome, chromoting
Review URL: http://codereview.chromium.org/4446005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/protocol_test_client.cc')
-rw-r--r-- | remoting/protocol/protocol_test_client.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc index 3ea145a..aa40195 100644 --- a/remoting/protocol/protocol_test_client.cc +++ b/remoting/protocol/protocol_test_client.cc @@ -29,7 +29,6 @@ extern "C" { using remoting::kChromotingTokenServiceName; namespace remoting { - namespace protocol { namespace { @@ -286,7 +285,7 @@ void ProtocolTestClient::OnStateChange( ProtocolTestConnection* connection = new ProtocolTestConnection(this, client_->message_loop()); connection->Init(session_manager_->Connect( - host_jid_, CandidateChromotocolConfig::CreateDefault(), + host_jid_, CandidateSessionConfig::CreateDefault(), NewCallback(connection, &ProtocolTestConnection::OnStateChange))); connections_.push_back(make_scoped_refptr(connection)); @@ -301,7 +300,7 @@ void ProtocolTestClient::OnNewSession( SessionManager::IncomingSessionResponse* response) { std::cerr << "Accepting connection from " << session->jid() << std::endl; - session->set_config(ChromotocolConfig::CreateDefault()); + session->set_config(SessionConfig::CreateDefault()); *response = SessionManager::ACCEPT; ProtocolTestConnection* test_connection = @@ -331,7 +330,6 @@ void ProtocolTestClient::DestroyConnection( } } // namespace protocol - } // namespace remoting using remoting::protocol::ProtocolTestClient; |