summaryrefslogtreecommitdiffstats
path: root/webkit/mocks
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 22:51:15 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 22:51:15 +0000
commit85a37afd0c15594949e427d507330f424410bcc5 (patch)
treeae8a7fd9a8dfcef7cd3ac5e5fc3fb9c9a61a9a35 /webkit/mocks
parentaa452e9df9d9f710d239ecd716796c80c7f93174 (diff)
downloadchromium_src-85a37afd0c15594949e427d507330f424410bcc5.zip
chromium_src-85a37afd0c15594949e427d507330f424410bcc5.tar.gz
chromium_src-85a37afd0c15594949e427d507330f424410bcc5.tar.bz2
Move webkit/media/ into webkit/renderer/media
This code is only used in renderer processes, this just moves the files to reflect that fact in the directory structure so we can verify it with DEPS. BUG=237267 Review URL: https://chromiumcodereview.appspot.com/15842010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/mocks')
-rw-r--r--webkit/mocks/test_media_stream_client.cc10
-rw-r--r--webkit/mocks/test_media_stream_client.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/mocks/test_media_stream_client.cc b/webkit/mocks/test_media_stream_client.cc
index 056ccaa..632f6b39 100644
--- a/webkit/mocks/test_media_stream_client.cc
+++ b/webkit/mocks/test_media_stream_client.cc
@@ -11,11 +11,11 @@
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
-#include "webkit/media/media_stream_audio_renderer.h"
-#include "webkit/media/simple_video_frame_provider.h"
-#include "webkit/media/webmediaplayer_impl.h"
-#include "webkit/media/webmediaplayer_ms.h"
-#include "webkit/media/webmediaplayer_params.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/simple_video_frame_provider.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
using namespace WebKit;
diff --git a/webkit/mocks/test_media_stream_client.h b/webkit/mocks/test_media_stream_client.h
index c264f4d..b759f49 100644
--- a/webkit/mocks/test_media_stream_client.h
+++ b/webkit/mocks/test_media_stream_client.h
@@ -11,7 +11,7 @@
#include "base/callback_forward.h"
#include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/media/media_stream_client.h"
+#include "webkit/renderer/media/media_stream_client.h"
namespace WebKit {
class WebFrame;