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

Unified Diff: content/renderer/media/android/media_info_loader_unittest.cc

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib 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/android/media_info_loader_unittest.cc
diff --git a/webkit/renderer/media/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc
similarity index 98%
rename from webkit/renderer/media/media_info_loader_unittest.cc
rename to content/renderer/media/android/media_info_loader_unittest.cc
index 45d7f997368f21722dca61f977ebc5d7cc678e02..c3d0bfd04572ccce916faba7cf6a0d3dfd60f1a3 100644
--- a/webkit/renderer/media/media_info_loader_unittest.cc
+++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -4,14 +4,14 @@
#include "base/bind.h"
#include "base/message_loop.h"
-#include "third_party/WebKit/public/web/WebMediaPlayer.h"
-#include "third_party/WebKit/public/web/WebView.h"
+#include "content/renderer/media/android/media_info_loader.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebMediaPlayer.h"
+#include "third_party/WebKit/public/web/WebView.h"
#include "webkit/mocks/mock_webframeclient.h"
#include "webkit/mocks/mock_weburlloader.h"
-#include "webkit/renderer/media/media_info_loader.h"
using ::testing::_;
using ::testing::InSequence;
@@ -25,7 +25,7 @@ using WebKit::WebView;
using webkit_glue::MockWebFrameClient;
using webkit_glue::MockWebURLLoader;
-namespace webkit_media {
+namespace content {
static const char* kHttpUrl = "http://test";
static const char kHttpRedirectToSameDomainUrl1[] = "http://test/ing";
@@ -190,4 +190,4 @@ TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) {
EXPECT_FALSE(loader_->DidPassCORSAccessCheck());
}
-} // namespace webkit_media
+} // namespace content
« no previous file with comments | « content/renderer/media/android/media_info_loader.cc ('k') | content/renderer/media/android/media_source_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698