Revert "Revert "Remove dependencies on /media for iOS.""

content/public/test/content_test_suite_base.cc

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 f245683db1f4d900eb954343ef0bf9f3a9e29670..ce6eac3ab831aac820e81cf7fcbf09d38c908ee8 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -19,7 +19,6 @@
 #include "content/public/common/content_paths.h"
 #include "content/renderer/renderer_main_thread.h"
 #include "content/utility/utility_main_thread.h"
-#include "media/base/media.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 
@@ -34,6 +33,10 @@
 #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 {
@@ -71,10 +74,9 @@ void ContentTestSuiteBase::Initialize() {
   RenderProcessHost::RegisterRendererMainThreadFactory(
       CreateRendererMainThread);
   GpuProcessHost::RegisterGpuMainThreadFactory(CreateGpuMainThread);
-#endif
-
   if (external_libraries_enabled_)
     media::InitializeMediaLibraryForTesting();
+#endif
 
   scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
   SetContentClient(client_for_init.get());