Revert of MediaStream audio object graph untangling and clean-ups.

content/renderer/media/user_media_client_impl_unittest.cc

Index: content/renderer/media/user_media_client_impl_unittest.cc
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index 0859d86dd3d9ac0e0c85faa1a62ced981745417e..36850f15737fe9e4d97510c36904b77b44b9f99f 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/media_stream.h"
-#include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_track.h"
 #include "content/renderer/media/mock_media_stream_dispatcher.h"
 #include "content/renderer/media/mock_media_stream_video_source.h"
@@ -285,8 +284,8 @@
   EXPECT_EQ(desc1_audio_tracks[0].source().id(),
             desc2_audio_tracks[0].source().id());
 
-  EXPECT_EQ(MediaStreamAudioSource::From(desc1_audio_tracks[0].source()),
-            MediaStreamAudioSource::From(desc2_audio_tracks[0].source()));
+  EXPECT_EQ(desc1_audio_tracks[0].source().getExtraData(),
+            desc2_audio_tracks[0].source().getExtraData());
 }
 
 // Test that the same source object is not used if two MediaStreams are
@@ -315,8 +314,8 @@
   EXPECT_NE(desc1_audio_tracks[0].source().id(),
             desc2_audio_tracks[0].source().id());
 
-  EXPECT_NE(MediaStreamAudioSource::From(desc1_audio_tracks[0].source()),
-            MediaStreamAudioSource::From(desc2_audio_tracks[0].source()));
+  EXPECT_NE(desc1_audio_tracks[0].source().getExtraData(),
+            desc2_audio_tracks[0].source().getExtraData());
 }
 
 TEST_F(UserMediaClientImplTest, StopLocalTracks) {