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

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 19002008: Revert "Remove dependencies on /media for iOS." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_test_suite_base.cc
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index a33c14a7863961e23cb798a2ea0bdee03d3137b0..459c37d599301d382ed50b261857f8a71ab96ddc 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -13,6 +13,7 @@
#include "content/common/url_schemes.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
+#include "media/base/media.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
#include "ui/compositor/compositor_setup.h"
@@ -28,10 +29,6 @@
#include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
#endif
-#if !defined(OS_IOS)
-#include "media/base/media.h"
-#endif
-
namespace content {
class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
@@ -64,10 +61,8 @@ void ContentTestSuiteBase::Initialize() {
ui::shell_dialogs::RegisterJni(env);
#endif
-#if !defined(OS_IOS)
if (external_libraries_enabled_)
media::InitializeMediaLibraryForTesting();
-#endif
scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
SetContentClient(client_for_init.get());
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698