Update webrtc&libjingle 6774:6825.

content/renderer/media/webrtc/media_stream_track_metrics_unittest.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 "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
@@ skipping 62 matching lines @@
   MOCK_METHOD4(SendLifetimeMessage,
                void(const std::string&, TrackType, LifetimeEvent, StreamType));
 
   using MediaStreamTrackMetrics::MakeUniqueIdImpl;
 };
 
 class MediaStreamTrackMetricsTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     metrics_.reset(new MockMediaStreamTrackMetrics());
-    stream_ = new talk_base::RefCountedObject<MockMediaStream>("stream");
+    stream_ = new rtc::RefCountedObject<MockMediaStream>("stream");
   }
 
   virtual void TearDown() OVERRIDE {
     metrics_.reset();
     stream_ = NULL;
   }
 
   scoped_refptr<MockAudioTrackInterface> MakeAudioTrack(std::string id) {
-    return new talk_base::RefCountedObject<MockAudioTrackInterface>(id);
+    return new rtc::RefCountedObject<MockAudioTrackInterface>(id);
   }
 
   scoped_refptr<MockVideoTrackInterface> MakeVideoTrack(std::string id) {
-    return new talk_base::RefCountedObject<MockVideoTrackInterface>(id);
+    return new rtc::RefCountedObject<MockVideoTrackInterface>(id);
   }
 
   scoped_ptr<MockMediaStreamTrackMetrics> metrics_;
   scoped_refptr<MediaStreamInterface> stream_;
 };
 
 TEST_F(MediaStreamTrackMetricsTest, MakeUniqueId) {
   // The important testable properties of the unique ID are that it
   // should differ when any of the three constituents differ
   // (PeerConnection pointer, track ID, remote or not. Also, testing
@@ skipping 427 matching lines @@
                                   MediaStreamTrackMetrics::SENT_STREAM));
   EXPECT_CALL(*metrics_,
               SendLifetimeMessage("video3",
                                   MediaStreamTrackMetrics::VIDEO_TRACK,
                                   MediaStreamTrackMetrics::DISCONNECTED,
                                   MediaStreamTrackMetrics::SENT_STREAM));
   metrics_->RemoveStream(MediaStreamTrackMetrics::SENT_STREAM, stream_);
 }
 
 }  // namespace content