Migrate MediaStream test code from content/shell/renderer/ to content/test/.

content/test/test_media_stream_client.h

Index: content/test/test_media_stream_client.h
diff --git a/content/shell/renderer/shell_media_stream_client.h b/content/test/test_media_stream_client.h
similarity index 64%
rename from content/shell/renderer/shell_media_stream_client.h
rename to content/test/test_media_stream_client.h
index df74532ac6f7f87d8cd7dd22da0ca3b82096d31e..ea872e2843f1387e3e5fae072e12650bb9830e6e 100644
--- a/content/shell/renderer/shell_media_stream_client.h
+++ b/content/test/test_media_stream_client.h
@@ -2,21 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_SHELL_RENDERER_SHELL_MEDIA_STREAM_CLIENT_H_
-#define CONTENT_SHELL_RENDERER_SHELL_MEDIA_STREAM_CLIENT_H_
+#ifndef CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_
+#define CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_
 
 #include "base/callback_forward.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "webkit/renderer/media/media_stream_client.h"
 
 namespace content {
 
-// ShellMediaStreamClient is a mock implementation of
+// TestMediaStreamClient is a mock implementation of
 // webkit_media::MediaStreamClient used when running layout tests.
-class ShellMediaStreamClient : public webkit_media::MediaStreamClient {
+class TestMediaStreamClient : public RenderViewObserver,
+                              public webkit_media::MediaStreamClient {
  public:
-  ShellMediaStreamClient();
-  virtual ~ShellMediaStreamClient();
+  explicit TestMediaStreamClient(RenderView* render_view);
+  virtual ~TestMediaStreamClient();
 
   // webkit_media::MediaStreamClient implementation.
   virtual bool IsMediaStream(const GURL& url) OVERRIDE;
@@ -30,4 +32,4 @@ class ShellMediaStreamClient : public webkit_media::MediaStreamClient {
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_RENDERER_SHELL_MEDIA_STREAM_CLIENT_H_
+#endif  // CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_