Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/session_config.cc

 // Copyright (c) 2012 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/session_config.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 143 matching lines @@
                                           ChannelConfig::CODEC_UNDEFINED);
   result->event_config_ = ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED);
   result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_VP8);
   result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_NONE,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED);
-  return result.Pass();
+  return result;
 }
 
 scoped_ptr<SessionConfig> SessionConfig::ForTestWithVerbatimVideo() {
   scoped_ptr<SessionConfig> result = ForTest();
   result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_VERBATIM);
-  return result.Pass();
+  return result;
 }
 
 scoped_ptr<SessionConfig> SessionConfig::ForTestWithWebrtc() {
   return make_scoped_ptr(new SessionConfig(Protocol::WEBRTC));
 }
 
 const ChannelConfig& SessionConfig::control_config() const {
   DCHECK(protocol_ == Protocol::ICE);
   return control_config_;
 }
@@ skipping 58 matching lines @@
     case SessionConfig::Protocol::ICE:
       result->set_webrtc_supported(false);
       result->set_ice_supported(true);
       result->mutable_control_configs()->push_back(config.control_config());
       result->mutable_event_configs()->push_back(config.event_config());
       result->mutable_video_configs()->push_back(config.video_config());
       result->mutable_audio_configs()->push_back(config.audio_config());
       break;
   }
 
-  return result.Pass();
+  return result;
 }
 
 // static
 scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
   scoped_ptr<CandidateSessionConfig> result = CreateEmpty();
 
   result->set_ice_supported(true);
 
   // Control channel.
   result->mutable_control_configs()->push_back(
@@ skipping 17 matching lines @@
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP8));
 
   // Audio channel.
   result->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_OPUS));
   result->mutable_audio_configs()->push_back(ChannelConfig::None());
 
-  return result.Pass();
+  return result;
 }
 
 void CandidateSessionConfig::DisableAudioChannel() {
   mutable_audio_configs()->clear();
   mutable_audio_configs()->push_back(ChannelConfig());
 }
 
 void CandidateSessionConfig::PreferTransport(
     ChannelConfig::TransportType transport) {
   UpdateConfigListToPreferTransport(&control_configs_, transport);
   UpdateConfigListToPreferTransport(&event_configs_, transport);
   UpdateConfigListToPreferTransport(&video_configs_, transport);
   UpdateConfigListToPreferTransport(&audio_configs_, transport);
 }
 
 }  // namespace protocol
 }  // namespace remoting