1 files changed, 2 insertions, 13 deletions
diff --git a/ui/gfx/compositor/test/test_suite.cc b/ui/gfx/compositor/test/test_suite.cc
index 2ac22d4..0072fe4 100644
--- a/ui/gfx/compositor/test/test_suite.cc
+++ b/ui/gfx/compositor/test/test_suite.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -6,16 +6,12 @@
 
 #include "base/message_loop.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/compositor/compositor_cc.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_cc.h"
-#endif
-
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
@@ -28,23 +24,16 @@ void CompositorTestSuite::Initialize() {
   base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();
-  ui::RegisterPathProvider();
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
   ui::CompositorTestSupport::Initialize();
-#if defined(USE_WEBKIT_COMPOSITOR)
   ui::CompositorCC::Initialize(false);
-#endif
 }
 
 void CompositorTestSuite::Shutdown() {
-#if defined(USE_WEBKIT_COMPOSITOR)
   ui::CompositorCC::Terminate();
-#endif
   ui::CompositorTestSupport::Terminate();
   message_loop_.reset();
 
-  ui::ResourceBundle::CleanupSharedInstance();
-
   base::TestSuite::Shutdown();
 }