Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: content/renderer/media/buffered_data_source_unittest.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delegates Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/buffered_data_source_unittest.cc
diff --git a/webkit/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc
similarity index 99%
rename from webkit/renderer/media/buffered_data_source_unittest.cc
rename to content/renderer/media/buffered_data_source_unittest.cc
index 1a7589cac287ff1befaba522d96bda16cace6e19..eafd6e80beb22aabf2612d381933dbc489371c37 100644
--- a/webkit/renderer/media/buffered_data_source_unittest.cc
+++ b/content/renderer/media/buffered_data_source_unittest.cc
@@ -4,6 +4,8 @@
#include "base/bind.h"
#include "base/message_loop.h"
+#include "content/renderer/media/buffered_data_source.h"
+#include "content/renderer/media/test_response_generator.h"
#include "media/base/media_log.h"
#include "media/base/mock_data_source_host.h"
#include "media/base/mock_filters.h"
@@ -12,8 +14,6 @@
#include "third_party/WebKit/public/web/WebView.h"
#include "webkit/mocks/mock_webframeclient.h"
#include "webkit/mocks/mock_weburlloader.h"
-#include "webkit/renderer/media/buffered_data_source.h"
-#include "webkit/renderer/media/test_response_generator.h"
using ::testing::_;
using ::testing::Assign;
@@ -31,7 +31,7 @@ using WebKit::WebView;
using webkit_glue::MockWebFrameClient;
using webkit_glue::MockWebURLLoader;
-namespace webkit_media {
+namespace content {
// Overrides CreateResourceLoader() to permit injecting a MockWebURLLoader.
// Also keeps track of whether said MockWebURLLoader is actively loading.
@@ -654,4 +654,4 @@ TEST_F(BufferedDataSourceTest, File_FinishLoading) {
Stop();
}
-} // namespace webkit_media
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698