Index: content/test/content_test_suite.cc |
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc |
index 318e34e3d880fd29ad17063fdf71a8f486852831..a93c3e8158f8130ee7649bb77cacd4165bb25d7d 100644 |
--- a/content/test/content_test_suite.cc |
+++ b/content/test/content_test_suite.cc |
@@ -6,6 +6,7 @@ |
#include "base/base_paths.h" |
#include "base/base_switches.h" |
+#include "base/command_line.h" |
#include "base/logging.h" |
#include "base/macros.h" |
#include "build/build_config.h" |
@@ -14,7 +15,9 @@ |
#include "content/public/test/test_content_client_initializer.h" |
#include "gpu/config/gpu_info_collector.h" |
#include "gpu/config/gpu_util.h" |
+#include "media/base/media.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "ui/gl/test/gl_surface_test_support.h" |
#if defined(OS_WIN) |
#include "ui/gfx/win/dpi.h" |
@@ -22,17 +25,8 @@ |
#if defined(OS_MACOSX) |
#include "base/mac/scoped_nsautorelease_pool.h" |
-#if !defined(OS_IOS) |
#include "base/test/mock_chrome_application_mac.h" |
#endif |
-#endif |
- |
-#if !defined(OS_IOS) |
-#include "base/base_switches.h" |
-#include "base/command_line.h" |
-#include "media/base/media.h" |
-#include "ui/gl/test/gl_surface_test_support.h" |
-#endif |
#if defined(OS_ANDROID) |
#include "content/browser/android/in_process_surface_texture_manager.h" |
@@ -78,10 +72,8 @@ ContentTestSuite::~ContentTestSuite() { |
void ContentTestSuite::Initialize() { |
#if defined(OS_MACOSX) |
base::mac::ScopedNSAutoreleasePool autorelease_pool; |
-#if !defined(OS_IOS) |
mock_cr_app::RegisterMockCrApp(); |
#endif |
-#endif |
#if defined(OS_WIN) |
gfx::SetDefaultDeviceScaleFactor(1.0f); |
@@ -93,7 +85,6 @@ void ContentTestSuite::Initialize() { |
ContentTestSuiteBase::RegisterContentSchemes(&client); |
} |
RegisterPathProvider(); |
-#if !defined(OS_IOS) |
media::InitializeMediaLibrary(); |
// When running in a child process for Mac sandbox tests, the sandbox exists |
// to initialize GL, so don't do it here. |
@@ -106,7 +97,6 @@ void ContentTestSuite::Initialize() { |
base::CommandLine::ForCurrentProcess()); |
gfx::GLSurfaceTestSupport::InitializeOneOff(); |
} |
-#endif |
testing::TestEventListeners& listeners = |
testing::UnitTest::GetInstance()->listeners(); |
listeners.Append(new TestInitializationListener); |