Readability review.

remoting/host/cast_extension_session.cc

 // Copyright 2014 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/host/cast_extension_session.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 216 matching lines @@
 void CastExtensionSession::OnCreateSessionDescriptionFailure(
     const std::string& error) {
   VLOG(1) << "Creating Session Description failed: " << error;
 }
 
 // TODO(aiguha): Support the case(s) where we've grabbed the capturer already,
 // but another extension reset the video pipeline. We should remove the
 // stream from the peer connection here, and then attempt to re-setup the
 // peer connection in the OnRenegotiationNeeded() callback.
 // See crbug.com/403843.
-scoped_ptr<webrtc::DesktopCapturer> CastExtensionSession::OnCreateVideoCapturer(
-    scoped_ptr<webrtc::DesktopCapturer> capturer) {
+void CastExtensionSession::OnCreateVideoCapturer(
+    scoped_ptr<webrtc::DesktopCapturer>* capturer) {
   if (has_grabbed_capturer_) {
     LOG(ERROR) << "The video pipeline was reset unexpectedly.";
     has_grabbed_capturer_ = false;
     peer_connection_->RemoveStream(stream_.release());
-    return capturer.Pass();
+    return;
   }
 
   if (received_offer_) {
     has_grabbed_capturer_ = true;
-    if (SetupVideoStream(capturer.Pass())) {
+    if (SetupVideoStream(capturer->Pass())) {
       peer_connection_->CreateAnswer(create_session_desc_observer_, NULL);
     } else {
       has_grabbed_capturer_ = false;
       // Ignore the received offer, since we failed to setup a video stream.
       received_offer_ = false;
     }
-    return scoped_ptr<webrtc::DesktopCapturer>();
+    return;
   }
-
-  return capturer.Pass();
 }
 
 bool CastExtensionSession::ModifiesVideoPipeline() const {
   return true;
 }
 
 // Returns true if the |message| is a Cast ExtensionMessage, even if
 // it was badly formed or a resulting action failed. This is done so that
 // the host does not continue to attempt to pass |message| to other
 // HostExtensionSessions.
@@ skipping 396 matching lines @@
   json->SetString(kWebRtcCandidate, candidate_str);
   std::string json_str;
   if (!base::JSONWriter::Write(json.get(), &json_str)) {
     LOG(ERROR) << "Failed to serialize candidate message.";
     return;
   }
   SendMessageToClient(kSubjectNewCandidate, json_str);
 }
 
 }  // namespace remoting
-