diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 04:10:52 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 04:10:52 +0000 |
| commit | 5bf5231373631d2ed940ad9eb03da77132411f57 (patch) | |
| tree | ce46ce9f8c4c9b387734adef17de07ca9e306af7 /remoting/protocol/connection_to_host.cc | |
| parent | 0bc93ad3a6030cac29eae47feba2704b92b9f15a (diff) | |
| download | chromium_src-5bf5231373631d2ed940ad9eb03da77132411f57.zip chromium_src-5bf5231373631d2ed940ad9eb03da77132411f57.tar.gz chromium_src-5bf5231373631d2ed940ad9eb03da77132411f57.tar.bz2 | |
Use scoped_ptr<>.Pass() to pass ownership in the remoting protocol code.
Review URL: https://chromiumcodereview.appspot.com/9240033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.cc')
| -rw-r--r-- | remoting/protocol/connection_to_host.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc index 9d00f8d..879e1b2 100644 --- a/remoting/protocol/connection_to_host.cc +++ b/remoting/protocol/connection_to_host.cc @@ -124,14 +124,14 @@ void ConnectionToHost::OnSessionManagerReady() { DCHECK(message_loop_->BelongsToCurrentThread()); // After SessionManager is initialized we can try to connect to the host. - CandidateSessionConfig* candidate_config = + scoped_ptr<CandidateSessionConfig> candidate_config = CandidateSessionConfig::CreateDefault(); - V1ClientAuthenticator* authenticator = - new V1ClientAuthenticator(signal_strategy_->GetLocalJid(), access_code_); - session_.reset(session_manager_->Connect( - host_jid_, authenticator, candidate_config, + scoped_ptr<Authenticator> authenticator( + new V1ClientAuthenticator(signal_strategy_->GetLocalJid(), access_code_)); + session_ = session_manager_->Connect( + host_jid_, authenticator.Pass(), candidate_config.Pass(), base::Bind(&ConnectionToHost::OnSessionStateChange, - base::Unretained(this)))); + base::Unretained(this))); } void ConnectionToHost::OnIncomingSession( |