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

content/shell/renderer/webkit_test_runner.cc

 // 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.
 
 #include "content/shell/renderer/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 497 matching lines @@
   size_t num_entries = session_histories_[pos].size();
   *currentEntryIndex = current_entry_indexes_[pos];
   WebVector<WebHistoryItem> result(num_entries);
   for (size_t entry = 0; entry < num_entries; ++entry) {
     result[entry] =
         PageStateToHistoryItem(session_histories_[pos][entry]);
   }
   history->swap(result);
 }
 
+// TODO(scherkus): Remove once https://codereview.chromium.org/18130006
+// rolls into Chromium.
 WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
-    WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
-{
+    WebFrame* frame,
+    const WebURL& url,
+    WebMediaPlayerClient* client) {
   if (!shell_media_stream_client_) {
     shell_media_stream_client_.reset(new ShellMediaStreamClient());
   }
 
   if (shell_media_stream_client_->IsMediaStream(url)) {
     return new webkit_media::WebMediaPlayerMS(
         frame,
         client,
         base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
         shell_media_stream_client_.get(),
         new media::MediaLog());
   }
 
 #if defined(OS_ANDROID)
   return NULL;
 #else
-  // TODO(scherkus): Use RenderViewImpl::createMediaPlayer() instead of
-  // duplicating code here, see http://crbug.com/239826
   webkit_media::WebMediaPlayerParams params(
-      GetMediaThreadMessageLoopProxy(), NULL, NULL, new media::MediaLog());
+      GetMediaThreadMessageLoopProxy(),
+      base::Callback<void(const base::Closure&)>(),
+      NULL,
+      NULL,
+      new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
       params);
 #endif
 }
 
 // RenderViewObserver  --------------------------------------------------------
 
@@ skipping 151 matching lines @@
       ->loadRequest(WebURLRequest(GURL("about:blank")));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
 void WebKitTestRunner::OnNotifyDone() {
   render_view()->GetWebView()->mainFrame()->executeScript(
       WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
 }
 
 }  // namespace content