A bunch of interfaces: Return scoped_ptr<SSLCertificate>

webrtc/p2p/base/transportcontroller.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 68 matching lines @@
 }
 
 bool TransportController::GetLocalCertificate(
     const std::string& transport_name,
     rtc::scoped_refptr<rtc::RTCCertificate>* certificate) {
   return worker_thread_->Invoke<bool>(
       rtc::Bind(&TransportController::GetLocalCertificate_w, this,
                 transport_name, certificate));
 }
 
-bool TransportController::GetRemoteSSLCertificate(
-    const std::string& transport_name,
-    rtc::SSLCertificate** cert) {
-  return worker_thread_->Invoke<bool>(
-      rtc::Bind(&TransportController::GetRemoteSSLCertificate_w, this,
-                transport_name, cert));
+rtc::scoped_ptr<rtc::SSLCertificate>
+TransportController::GetRemoteSSLCertificate(
+    const std::string& transport_name) {
+  return worker_thread_->Invoke<rtc::scoped_ptr<rtc::SSLCertificate>>(rtc::Bind(
+      &TransportController::GetRemoteSSLCertificate_w, this, transport_name));
 }
 
 bool TransportController::SetLocalTransportDescription(
     const std::string& transport_name,
     const TransportDescription& tdesc,
     ContentAction action,
     std::string* err) {
   return worker_thread_->Invoke<bool>(
       rtc::Bind(&TransportController::SetLocalTransportDescription_w, this,
                 transport_name, tdesc, action, err));
@@ skipping 283 matching lines @@
   RTC_DCHECK(worker_thread_->IsCurrent());
 
   Transport* t = GetTransport_w(transport_name);
   if (!t) {
     return false;
   }
 
   return t->GetLocalCertificate(certificate);
 }
 
-bool TransportController::GetRemoteSSLCertificate_w(
-    const std::string& transport_name,
-    rtc::SSLCertificate** cert) {
+rtc::scoped_ptr<rtc::SSLCertificate>
+TransportController::GetRemoteSSLCertificate_w(
+    const std::string& transport_name) {
   RTC_DCHECK(worker_thread_->IsCurrent());
 
   Transport* t = GetTransport_w(transport_name);
   if (!t) {
-    return false;
+    return nullptr;
   }
 
-  return t->GetRemoteSSLCertificate(cert);
+  return t->GetRemoteSSLCertificate();
 }
 
 bool TransportController::SetLocalTransportDescription_w(
     const std::string& transport_name,
     const TransportDescription& tdesc,
     ContentAction action,
     std::string* err) {
   RTC_DCHECK(worker_thread()->IsCurrent());
 
   Transport* transport = GetTransport_w(transport_name);
@@ skipping 226 matching lines @@
   }
   if (gathering_state_ != new_gathering_state) {
     gathering_state_ = new_gathering_state;
     signaling_thread_->Post(
         this, MSG_ICEGATHERINGSTATE,
         new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
   }
 }
 
 }  // namespace cricket