Add a 'remote' property to MediaSourceInterface. Also adding an implementation to the relevant sour…

talk/app/webrtc/mediastream_unittest.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 30 matching lines @@
 static const char kAudioTrackId[] = "dummy_microphone_1";
 
 using rtc::scoped_refptr;
 using ::testing::Exactly;
 
 namespace webrtc {
 
 // Helper class to test Observer.
 class MockObserver : public ObserverInterface {
  public:
-  MockObserver() {}
+  explicit MockObserver(NotifierInterface* notifier) : notifier_(notifier) {
+    notifier_->RegisterObserver(this);
+  }
+
+  ~MockObserver() { Unregister(); }
+
+  void Unregister() {
+    if (notifier_) {
+      notifier_->UnregisterObserver(this);
+      notifier_ = nullptr;
+    }
+  }
 
   MOCK_METHOD0(OnChanged, void());
+
+ private:
+  NotifierInterface* notifier_;
 };
 
 class MediaStreamTest: public testing::Test {
  protected:
   virtual void SetUp() {
     stream_ = MediaStream::Create(kStreamLabel1);
     ASSERT_TRUE(stream_.get() != NULL);
 
     video_track_ = VideoTrack::Create(kVideoTrackId, NULL);
     ASSERT_TRUE(video_track_.get() != NULL);
     EXPECT_EQ(MediaStreamTrackInterface::kInitializing, video_track_->state());
 
     audio_track_ = AudioTrack::Create(kAudioTrackId, NULL);
 
     ASSERT_TRUE(audio_track_.get() != NULL);
     EXPECT_EQ(MediaStreamTrackInterface::kInitializing, audio_track_->state());
 
     EXPECT_TRUE(stream_->AddTrack(video_track_));
     EXPECT_FALSE(stream_->AddTrack(video_track_));
     EXPECT_TRUE(stream_->AddTrack(audio_track_));
     EXPECT_FALSE(stream_->AddTrack(audio_track_));
   }
 
   void ChangeTrack(MediaStreamTrackInterface* track) {
-    MockObserver observer;
-    track->RegisterObserver(&observer);
+    MockObserver observer(track);
 
     EXPECT_CALL(observer, OnChanged())
         .Times(Exactly(1));
     track->set_enabled(false);
     EXPECT_FALSE(track->enabled());
 
     EXPECT_CALL(observer, OnChanged())
         .Times(Exactly(1));
     track->set_state(MediaStreamTrackInterface::kLive);
     EXPECT_EQ(MediaStreamTrackInterface::kLive, track->state());
@@ skipping 30 matching lines @@
   ASSERT_EQ(1u, stream_->GetAudioTracks().size());
   EXPECT_TRUE(stream_->GetAudioTracks()[0].get() == audio_track.get());
   EXPECT_TRUE(stream_->FindAudioTrack(audio_track->id()).get()
               == audio_track.get());
   audio_track = stream_->GetAudioTracks()[0];
   EXPECT_EQ(0, audio_track->id().compare(kAudioTrackId));
   EXPECT_TRUE(audio_track->enabled());
 }
 
 TEST_F(MediaStreamTest, RemoveTrack) {
-  MockObserver observer;
-  stream_->RegisterObserver(&observer);
+  MockObserver observer(stream_);
 
   EXPECT_CALL(observer, OnChanged())
       .Times(Exactly(2));
 
   EXPECT_TRUE(stream_->RemoveTrack(audio_track_));
   EXPECT_FALSE(stream_->RemoveTrack(audio_track_));
   EXPECT_EQ(0u, stream_->GetAudioTracks().size());
   EXPECT_EQ(0u, stream_->GetAudioTracks().size());
 
   EXPECT_TRUE(stream_->RemoveTrack(video_track_));
@@ skipping 12 matching lines @@
   ChangeTrack(video_track.get());
 }
 
 TEST_F(MediaStreamTest, ChangeAudioTrack) {
   scoped_refptr<webrtc::AudioTrackInterface> audio_track(
       stream_->GetAudioTracks()[0]);
   ChangeTrack(audio_track.get());
 }
 
 }  // namespace webrtc