Convert JsonWriter::Write to taking a const ref for the in-param

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 184 matching lines @@
         FROM_HERE,
         base::Bind(&CastExtensionSession::OnCreateSessionDescription,
                    base::Unretained(this),
                    desc));
     return;
   }
 
   peer_connection_->SetLocalDescription(
       CastSetSessionDescriptionObserver::Create(), desc);
 
-  scoped_ptr<base::DictionaryValue> json(new base::DictionaryValue());
-  json->SetString(kWebRtcSessionDescType, desc->type());
+  base::DictionaryValue json;
+  json.SetString(kWebRtcSessionDescType, desc->type());
   std::string subject =
       (desc->type() == "offer") ? kSubjectOffer : kSubjectAnswer;
   std::string desc_str;
   desc->ToString(&desc_str);
-  json->SetString(kWebRtcSessionDescSDP, desc_str);
+  json.SetString(kWebRtcSessionDescSDP, desc_str);
   std::string json_str;
-  if (!base::JSONWriter::Write(json.get(), &json_str)) {
+  if (!base::JSONWriter::Write(json, &json_str)) {
     LOG(ERROR) << "Failed to serialize sdp message.";
     return;
   }
 
   SendMessageToClient(subject.c_str(), json_str);
 }
 
 void CastExtensionSession::OnCreateSessionDescriptionFailure(
     const std::string& error) {
   VLOG(1) << "Creating Session Description failed: " << error;
@@ skipping 189 matching lines @@
   if (client_stub_ == nullptr) {
     LOG(ERROR) << "No Client Stub. Cannot send message to client.";
     return false;
   }
 
   base::DictionaryValue message_dict;
   message_dict.SetString(kTopLevelSubject, subject);
   message_dict.SetString(kTopLevelData, data);
   std::string message_json;
 
-  if (!base::JSONWriter::Write(&message_dict, &message_json)) {
+  if (!base::JSONWriter::Write(message_dict, &message_json)) {
     LOG(ERROR) << "Failed to serialize JSON message.";
     return false;
   }
 
   protocol::ExtensionMessage message;
   message.set_type(kExtensionMessageType);
   message.set_data(message_json);
   client_stub_->DeliverHostMessage(message);
   return true;
 }
@@ skipping 206 matching lines @@
   VLOG(1) << "PeerConnectionObserver: all ICE candidates found.";
 }
 
 void CastExtensionSession::OnIceCandidate(
     const webrtc::IceCandidateInterface* candidate) {
   std::string candidate_str;
   if (!candidate->ToString(&candidate_str)) {
     LOG(ERROR) << "PeerConnectionObserver: failed to serialize candidate.";
     return;
   }
-  scoped_ptr<base::DictionaryValue> json(new base::DictionaryValue());
-  json->SetString(kWebRtcSDPMid, candidate->sdp_mid());
-  json->SetInteger(kWebRtcSDPMLineIndex, candidate->sdp_mline_index());
-  json->SetString(kWebRtcCandidate, candidate_str);
+  base::DictionaryValue json;
+  json.SetString(kWebRtcSDPMid, candidate->sdp_mid());
+  json.SetInteger(kWebRtcSDPMLineIndex, candidate->sdp_mline_index());
+  json.SetString(kWebRtcCandidate, candidate_str);
   std::string json_str;
-  if (!base::JSONWriter::Write(json.get(), &json_str)) {
+  if (!base::JSONWriter::Write(json, &json_str)) {
     LOG(ERROR) << "Failed to serialize candidate message.";
     return;
   }
   SendMessageToClient(kSubjectNewCandidate, json_str);
 }
 
 }  // namespace remoting