Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

chrome/test/base/chrome_test_suite.cc

Index: chrome/test/base/chrome_test_suite.cc
===================================================================
--- chrome/test/base/chrome_test_suite.cc	(revision 113682)
+++ chrome/test/base/chrome_test_suite.cc	(working copy)
@@ -26,6 +26,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/test/gfx_test_utils.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ -37,12 +38,6 @@
 #include "base/shared_memory.h"
 #endif
 
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
-
 namespace {
 
 void RemoveSharedMemoryFile(const std::string& filename) {
@@ -198,11 +193,7 @@
   ResourceBundle::AddDataPackToSharedInstance(resources_pack_path);
 
   // Mock out the compositor on platforms that use it.
-#if defined(USE_WEBKIT_COMPOSITOR)
-  ui::SetupTestCompositor();
-#else
   ui::gfx_test_utils::SetupTestCompositor();
-#endif
 
   stats_filename_ = base::StringPrintf("unit_tests-%d",
                                        base::GetCurrentProcId());