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

ui/views/run_all_unittests.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 "base/test/test_suite.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
+#include "ui/gfx/test/gfx_test_utils.h"
 #include "ui/views/view.h"
 
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
-
 class ViewTestSuite : public base::TestSuite {
  public:
   ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  protected:
   virtual void Initialize() {
     base::TestSuite::Initialize();
 
     ui::RegisterPathProvider();
     ui::ResourceBundle::InitSharedInstance("en-US");
 
     ui::CompositorTestSupport::Initialize();
-#if defined(USE_WEBKIT_COMPOSITOR)
-    ui::SetupTestCompositor();
-#else
     ui::gfx_test_utils::SetupTestCompositor();
-#endif
   }
 
   virtual void Shutdown() {
     ui::CompositorTestSupport::Terminate();
   }
 };
 
 int main(int argc, char** argv) {
   return ViewTestSuite(argc, argv).Run();
 }