diff options
author | sergeyu <sergeyu@chromium.org> | 2014-09-29 12:38:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 19:38:43 +0000 |
commit | afce97826070950bca497ce147a30312ce780e74 (patch) | |
tree | 5d9741c3c98c97427665687d83561d709a2ca222 /remoting/host/chromoting_host_unittest.cc | |
parent | 7461dcda6673ccd78b82efc4719e1389fc0c215b (diff) | |
download | chromium_src-afce97826070950bca497ce147a30312ce780e74.zip chromium_src-afce97826070950bca497ce147a30312ce780e74.tar.gz chromium_src-afce97826070950bca497ce147a30312ce780e74.tar.bz2 |
Cleanup usage of scoped_ptr<> in remoting for C++11
- Use nullptr to initialize null scoped_ptr().
- use Pass(), PassAs() is no longer required.
Review URL: https://codereview.chromium.org/609923004
Cr-Commit-Position: refs/heads/master@{#297236}
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 2177dca..86eee32 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -182,8 +182,8 @@ class ChromotingHostTest : public testing::Test { void SimulateClientConnection(int connection_index, bool authenticate, bool reject) { scoped_ptr<protocol::ConnectionToClient> connection = - ((connection_index == 0) ? owned_connection1_ : owned_connection2_). - PassAs<protocol::ConnectionToClient>(); + ((connection_index == 0) ? owned_connection1_ : owned_connection2_) + .Pass(); protocol::ConnectionToClient* connection_ptr = connection.get(); scoped_ptr<ClientSession> client(new ClientSession( host_.get(), |