Clean up compositor initialization/destruction.

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 459c37d599301d382ed50b261857f8a71ab96ddc..5bf5b5eded1cb0668a5476cad4086ae013d39fe7 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -16,7 +16,6 @@
 #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"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -72,9 +71,6 @@ void ContentTestSuiteBase::Initialize() {
   RegisterPathProvider();
   ui::RegisterPathProvider();
 
-  // Mock out the compositor on platforms that use it.
-  ui::SetupTestCompositor();
-
   testing::UnitTest::GetInstance()->listeners().Append(
       new ContentTestSuiteBaseListener);
 }