Attempt 2 at : Makes tests either use mock compositor or mock

content/test/content_test_suite.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/content_test_suite.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gfx/test/gfx_test_utils.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.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 {
 
 class TestContentClientInitializer : public testing::EmptyTestEventListener {
  public:
   TestContentClientInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     notification_service_.reset(new NotificationServiceImpl());
@@ skipping 37 matching lines @@
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
 
   base::TestSuite::Initialize();
 
   content::RegisterPathProvider();
   ui::RegisterPathProvider();
 
   // Mock out the compositor on platforms that use it.
+#if defined(USE_WEBKIT_COMPOSITOR)
+  ui::SetupTestCompositor();
+#else
   ui::gfx_test_utils::SetupTestCompositor();
+#endif
 
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestContentClientInitializer);
 }