Update webrtc&libjingle 6774:6825.

content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MOCK_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_MOCK_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 127 matching lines @@
  public:
   explicit MockMediaStream(const std::string& label);
 
   virtual bool AddTrack(webrtc::AudioTrackInterface* track) OVERRIDE;
   virtual bool AddTrack(webrtc::VideoTrackInterface* track) OVERRIDE;
   virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) OVERRIDE;
   virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) OVERRIDE;
   virtual std::string label() const OVERRIDE;
   virtual webrtc::AudioTrackVector GetAudioTracks() OVERRIDE;
   virtual webrtc::VideoTrackVector GetVideoTracks() OVERRIDE;
-  virtual talk_base::scoped_refptr<webrtc::AudioTrackInterface>
+  virtual rtc::scoped_refptr<webrtc::AudioTrackInterface>
       FindAudioTrack(const std::string& track_id) OVERRIDE;
-  virtual talk_base::scoped_refptr<webrtc::VideoTrackInterface>
+  virtual rtc::scoped_refptr<webrtc::VideoTrackInterface>
       FindVideoTrack(const std::string& track_id) OVERRIDE;
   virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
   virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
 
  protected:
   virtual ~MockMediaStream();
 
  private:
   void NotifyObservers();
 
@@ skipping 64 matching lines @@
   bool fail_to_create_next_audio_capturer_;
   scoped_refptr <MockAudioSource> last_audio_source_;
   scoped_refptr <MockVideoSource> last_video_source_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionDependencyFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_MOCK_PEER_CONNECTION_DEPENDENCY_FACTORY_H_