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

content/shell/renderer/webkit_test_runner.h

 // Copyright (c) 2012 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_SHELL_WEBKIT_TEST_RUNNER_H_
 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 76 matching lines @@
   virtual int navigationEntryCount();
   virtual void goToOffset(int offset);
   virtual void reload();
   virtual void loadURLForFrame(const WebKit::WebURL& url,
                                const std::string& frame_name);
   virtual bool allowExternalPages();
   virtual void captureHistoryForWindow(
       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,
       WebKit::WebMediaPlayerClient* client);
 
   void Reset();
 
   void set_proxy(::WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; }
   ::WebTestRunner::WebTestProxyBase* proxy() const { return proxy_; }
 
@@ skipping 20 matching lines @@
   ShellTestConfiguration test_config_;
 
   std::vector<int> routing_ids_;
   std::vector<std::vector<PageState> > session_histories_;
   std::vector<unsigned> current_entry_indexes_;
 
   bool is_main_window_;
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_