diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
| commit | 1f99bc28b47392ed97d03863460bc681d7f39a1a (patch) | |
| tree | 7e8b989240415d3b6118d04a76a2b2f01958549a /content/public/test/content_test_suite_base.cc | |
| parent | 6b07fa26f4aa1a98e0aeb39c14ae6385d09e25a0 (diff) | |
| download | chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.zip chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.gz chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.bz2 | |
Revert "Remove dependencies on /media for iOS."
This reverts commit 5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.
We need to stop media_unittests running on the iOS simulator bot before we can
safely reland this CL.
TBR=bdibello
Review URL: https://codereview.chromium.org/19002008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/test/content_test_suite_base.cc')
| -rw-r--r-- | content/public/test/content_test_suite_base.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc index a33c14a..459c37d 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()); |