Use WeakPtr for RTCPeerConnectionHandler and RTCPeerConnectionTracker.

content/renderer/media/rtc_peer_connection_handler.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 90 matching lines @@
   static void ConvertOfferOptionsToConstraints(
       const blink::WebRTCOfferOptions& options,
       RTCMediaConstraints* output);
 
   void associateWithFrame(blink::WebFrame* frame);
 
   // Initialize method only used for unit test.
   bool InitializeForTest(
       const blink::WebRTCConfiguration& server_configuration,
       const blink::WebMediaConstraints& options,
-      PeerConnectionTracker* peer_connection_tracker);
+      const base::WeakPtr<PeerConnectionTracker>& peer_connection_tracker);
 
   // blink::WebRTCPeerConnectionHandler implementation
   virtual bool initialize(
       const blink::WebRTCConfiguration& server_configuration,
       const blink::WebMediaConstraints& options) override;
 
   virtual void createOffer(
       const blink::WebRTCSessionDescriptionRequest& request,
       const blink::WebMediaConstraints& options) override;
   virtual void createOffer(
@@ skipping 48 matching lines @@
   // Asynchronously calls native_peer_connection_->getStats on the signaling
   // thread.  If the |track_id| is empty, the |track_type| parameter is ignored.
   void GetStats(webrtc::StatsObserver* observer,
                 webrtc::PeerConnectionInterface::StatsOutputLevel level,
                 const std::string& track_id,
                 blink::WebMediaStreamSource::Type track_type);
 
   // Tells the |client_| to close RTCPeerConnection.
   void CloseClientPeerConnection();
 
-  PeerConnectionTracker* peer_connection_tracker();
-
  protected:
   webrtc::PeerConnectionInterface* native_peer_connection() {
     return native_peer_connection_.get();
   }
 
   class Observer;
   friend class Observer;
 
   void OnSignalingChange(
       webrtc::PeerConnectionInterface::SignalingState new_state);
@@ skipping 23 matching lines @@
   // RenderThreadImpl.
   PeerConnectionDependencyFactory* const dependency_factory_;
 
   blink::WebFrame* frame_;
 
   // Libjingle's signaling thread.
   const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
 
   ScopedVector<WebRtcMediaStreamAdapter> local_streams_;
 
-  PeerConnectionTracker* peer_connection_tracker_;
+  base::WeakPtr<PeerConnectionTracker> peer_connection_tracker_;
 
   MediaStreamTrackMetrics track_metrics_;
 
   // Counter for a UMA stat reported at destruction time.
   int num_data_channels_created_;
 
   // Counter for number of IPv4 and IPv6 local candidates.
   int num_local_candidates_ipv4_;
   int num_local_candidates_ipv6_;
 
   // |native_peer_connection_| is the libjingle native PeerConnection object.
   scoped_refptr<webrtc::PeerConnectionInterface> native_peer_connection_;
   scoped_refptr<Observer> peer_connection_observer_;
 
   typedef std::map<webrtc::MediaStreamInterface*,
       content::RemoteMediaStreamImpl*> RemoteStreamMap;
   RemoteStreamMap remote_streams_;
   scoped_refptr<webrtc::UMAObserver> uma_observer_;
   base::TimeTicks ice_connection_checking_start_;
   base::WeakPtrFactory<RTCPeerConnectionHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_