Update webrtc&libjingle 6774:6825.

content/renderer/media/webrtc/media_stream_track_metrics.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 "content/renderer/media/webrtc/media_stream_track_metrics.h"
 
 #include <inttypes.h>
 #include <set>
 #include <string>
 
@@ skipping 24 matching lines @@
   MediaStreamInterface* stream() { return stream_; }
   MediaStreamTrackMetrics::StreamType stream_type() { return stream_type_; }
 
  private:
   typedef std::set<std::string> IdSet;
 
   // webrtc::ObserverInterface implementation.
   virtual void OnChanged() OVERRIDE;
 
   template <class T>
-  IdSet GetTrackIds(const std::vector<talk_base::scoped_refptr<T> >& tracks) {
+  IdSet GetTrackIds(const std::vector<rtc::scoped_refptr<T> >& tracks) {
     IdSet track_ids;
-    typename std::vector<talk_base::scoped_refptr<T> >::const_iterator it =
+    typename std::vector<rtc::scoped_refptr<T> >::const_iterator it =
         tracks.begin();
     for (; it != tracks.end(); ++it) {
       track_ids.insert((*it)->id());
     }
     return track_ids;
   }
 
   void ReportAddedAndRemovedTracks(
       const IdSet& new_ids,
       const IdSet& old_ids,
       MediaStreamTrackMetrics::TrackType track_type);
 
   // Sends a lifetime message for the given tracks. OK to call with an
   // empty |ids|, in which case the method has no side effects.
   void ReportTracks(const IdSet& ids,
                     MediaStreamTrackMetrics::TrackType track_type,
                     MediaStreamTrackMetrics::LifetimeEvent event);
 
   // False until start/end of lifetime messages have been sent.
   bool has_reported_start_;
   bool has_reported_end_;
 
   // IDs of audio and video tracks in the stream being observed.
   IdSet audio_track_ids_;
   IdSet video_track_ids_;
 
   MediaStreamTrackMetrics::StreamType stream_type_;
-  talk_base::scoped_refptr<MediaStreamInterface> stream_;
+  rtc::scoped_refptr<MediaStreamInterface> stream_;
 
   // Non-owning.
   MediaStreamTrackMetrics* owner_;
 };
 
 namespace {
 
 // Used with std::find_if.
 struct ObserverFinder {
   ObserverFinder(MediaStreamTrackMetrics::StreamType stream_type,
@@ skipping 237 matching lines @@
 
 uint64 MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id,
                                              StreamType stream_type) {
   return MakeUniqueIdImpl(
       reinterpret_cast<uint64>(reinterpret_cast<void*>(this)),
       track_id,
       stream_type);
 }
 
 }  // namespace content