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>
 
 #include "base/base64.h"
 #include "base/debug/debugger.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "content/public/renderer/history_item_serialization.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/public/test/layouttest_support.h"
+#include "content/renderer/media/webmediaplayer_impl.h"
+#include "content/renderer/media/webmediaplayer_ms.h"
+#include "content/renderer/media/webmediaplayer_params.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/shell_media_stream_client.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
@@ skipping 18 matching lines @@
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebTestingSupport.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/gfx/rect.h"
 #include "webkit/common/webpreferences.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/renderer/media/webmediaplayer_impl.h"
-#include "webkit/renderer/media/webmediaplayer_ms.h"
-#include "webkit/renderer/media/webmediaplayer_params.h"
 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
 using WebKit::WebContextMenuData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDeviceOrientation;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGamepads;
 using WebKit::WebHistoryItem;
@@ skipping 430 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(
+    return new WebMediaPlayerMS(
         frame,
         client,
-        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        base::WeakPtr<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());
-  return new webkit_media::WebMediaPlayerImpl(
-      frame,
-      client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
-      params);
+  WebMediaPlayerParams params(
+      GetMediaThreadMessageLoopProxy(), NULL, NULL, NULL,
+      new media::MediaLog());
+  return new WebMediaPlayerImpl(
+      frame, client, base::WeakPtr<WebMediaPlayerDelegate>(), params);
 #endif
 }
 
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
   WebTestingSupport::injectInternalsObject(frame);
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
 }
 
@@ skipping 146 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