| 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());
|
|
|