Migrate webkit/renderer/media/ to content/renderer/media/.

content/shell/renderer/webkit_test_runner.h

Index: content/shell/renderer/webkit_test_runner.h
diff --git a/content/shell/renderer/webkit_test_runner.h b/content/shell/renderer/webkit_test_runner.h
index d5be5c8ce4c20a48abcde271afc693f620f5fe0c..67c288a9d7f2493bb48f3a114a779aa478f5eb81 100644
--- a/content/shell/renderer/webkit_test_runner.h
+++ b/content/shell/renderer/webkit_test_runner.h
@@ -94,6 +94,9 @@ class WebKitTestRunner : public RenderViewObserver,
       WebTestRunner::WebTestProxyBase* proxy,
       WebKit::WebVector<WebKit::WebHistoryItem>* history,
       size_t* currentEntryIndex);
+
+  // TODO(scherkus): Remove once https://codereview.chromium.org/18130006
+  // rolls into Chromium.
   virtual WebKit::WebMediaPlayer* createWebMediaPlayer(
       WebKit::WebFrame* frame,
       const WebKit::WebURL& url,
@@ -134,6 +137,8 @@ class WebKitTestRunner : public RenderViewObserver,
 
   bool focus_on_next_commit_;
 
+  // TODO(scherkus): Remove this after switching to using
+  // RenderViewImpl::createMediaPlayer() http://crbug.com/239826
   scoped_ptr<ShellMediaStreamClient> shell_media_stream_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);