Remove compositor_test_support

It is not needed anymore after https://codereview.chromium.org/11415089/

BUG=159278


Review URL: https://chromiumcodereview.appspot.com/11348171

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169355 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 0 insertions, 134 deletions

diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index c40236c..7fc5406 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -76,7 +76,6 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../compositor/compositor.gyp:compositor',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../views/views.gyp:views',
         '../views/views.gyp:views_test_support',
         'app_list',
diff --git a/ui/app_list/test/app_list_test_suite.cc b/ui/app_list/test/app_list_test_suite.cc
index e38a348..528d387 100644
--- a/ui/app_list/test/app_list_test_suite.cc
+++ b/ui/app_list/test/app_list_test_suite.cc
@@ -7,7 +7,6 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositor_setup.h"
-#include "ui/compositor/test/compositor_test_support.h"
 
 namespace app_list {
 namespace test {
@@ -25,12 +24,10 @@ void AppListTestSuite::Initialize() {
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
-  ui::CompositorTestSupport::Initialize();
   ui::SetupTestCompositor();
 }
 
 void AppListTestSuite::Shutdown() {
-  ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index cac39fd..dfeb557 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -195,7 +195,6 @@
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../compositor/compositor.gyp:compositor',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../../ipc/ipc.gyp:ipc',
@@ -219,7 +218,6 @@
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../compositor/compositor.gyp:compositor',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'aura',
@@ -240,7 +238,6 @@
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
         '../gl/gl.gyp:gl',
         '../ui.gyp:ui',
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 6d255ec..74d3022 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -26,7 +26,6 @@
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
-#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
@@ -297,7 +296,6 @@ int main(int argc, char** argv) {
   ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
   MessageLoop message_loop(MessageLoop::TYPE_UI);
-  ui::CompositorTestSupport::Initialize();
   aura::Env::GetInstance();
   aura::SetUseFullscreenHostWindow(true);
   aura::TestScreen test_screen;
@@ -356,7 +354,5 @@ int main(int argc, char** argv) {
   focus_manager.reset();
   root_window.reset();
 
-  ui::CompositorTestSupport::Terminate();
-
   return 0;
 }
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 91c95d3..5b8fa33 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -19,7 +19,6 @@
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 
@@ -121,7 +120,6 @@ class DemoStackingClient : public aura::client::StackingClient {
 int DemoMain() {
   // Create the message-loop here before creating the root window.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
-  ui::CompositorTestSupport::Initialize();
   aura::Env::GetInstance();
   aura::TestScreen test_screen;
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen);
@@ -158,8 +156,6 @@ int DemoMain() {
   root_window->ShowRootWindow();
   MessageLoopForUI::current()->Run();
 
-  ui::CompositorTestSupport::Terminate();
-
   return 0;
 }
 
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index f74757d..a0ac7e4 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -10,7 +10,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
-#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -29,13 +28,11 @@ void AuraTestSuite::Initialize() {
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
-  ui::CompositorTestSupport::Initialize();
 
   ui::SetupTestCompositor();
 }
 
 void AuraTestSuite::Shutdown() {
-  ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index c65ffe1..9f9e259b 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -69,30 +69,6 @@
       ],
     },
     {
-      'target_name': 'compositor_test_support',
-      'type': 'static_library',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'sources': [
-        'test/compositor_test_support.cc',
-        'test/compositor_test_support.h',
-      ],
-      'conditions': [
-        ['os_posix == 1 and OS != "mac"', {
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
@@ -105,7 +81,6 @@
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
-        'compositor_test_support',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
diff --git a/ui/compositor/test/compositor_test_support.cc b/ui/compositor/test/compositor_test_support.cc
deleted file mode 100644
index 0ac2609..0000000
--- a/ui/compositor/test/compositor_test_support.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-
-#include "ui/compositor/test/compositor_test_support.h"
-
-#include "base/compiler_specific.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
-
-namespace ui {
-
-class CompositorTestPlatformSupport:
-    public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) {
- public:
-  virtual string16 GetLocalizedString(int message_id) OVERRIDE {
-    return string16();
-  }
-
-  virtual base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) OVERRIDE {
-    return base::StringPiece();
-  }
-
-  virtual void GetPlugins(
-      bool refresh, std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE {
-  }
-
-  virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
-      const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
-      OVERRIDE {
-    NOTREACHED();
-    return NULL;
-  }
-
-  virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge(
-      WebKit::WebSocketStreamHandle* handle,
-      webkit_glue::WebSocketStreamHandleDelegate* delegate) OVERRIDE {
-    NOTREACHED();
-    return NULL;
-  }
-};
-
-static CompositorTestPlatformSupport* g_webkit_support;
-
-void CompositorTestSupport::Initialize() {
-  DCHECK(!g_webkit_support);
-  g_webkit_support = new CompositorTestPlatformSupport;
-  WebKit::initialize(g_webkit_support);
-}
-
-void CompositorTestSupport::Terminate() {
-  DCHECK(g_webkit_support);
-  WebKit::shutdown();
-  delete g_webkit_support;
-  g_webkit_support = NULL;
-}
-
-}  // namespace ui
diff --git a/ui/compositor/test/compositor_test_support.h b/ui/compositor/test/compositor_test_support.h
deleted file mode 100644
index e092340..0000000
--- a/ui/compositor/test/compositor_test_support.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.
-
-#ifndef UI_COMPOSITOR_TEST_COMPOSITOR_TEST_SUPPORT_H_
-#define UI_COMPOSITOR_TEST_COMPOSITOR_TEST_SUPPORT_H_
-
-namespace ui {
-
-class CompositorTestSupport {
- public:
-  // Called by programs that want to use a real compositor,
-  // but skip the typical initialization of browser_main.cc.
-  static void Initialize();
-  static void Terminate();
-};
-
-}  // namespace ui
-
-#endif  // UI_COMPOSITOR_TEST_COMPOSITOR_TEST_SUPPORT_H_
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index 5b2f052..ec20b36 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -7,7 +7,6 @@
 #include "base/message_loop.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
-#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -28,13 +27,11 @@ void CompositorTestSuite::Initialize() {
   gfx::RegisterPathProvider();
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
-  CompositorTestSupport::Initialize();
   Compositor::Initialize(false);
 }
 
 void CompositorTestSuite::Shutdown() {
   Compositor::Terminate();
-  CompositorTestSupport::Terminate();
   message_loop_.reset();
 
   base::TestSuite::Shutdown();
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index 0482acb..ef4b709 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
-#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 
 class ViewTestSuite : public base::TestSuite {
@@ -22,14 +21,9 @@ class ViewTestSuite : public base::TestSuite {
     ui::RegisterPathProvider();
     ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
-    ui::CompositorTestSupport::Initialize();
     ui::SetupTestCompositor();
   }
 
-  virtual void Shutdown() OVERRIDE {
-    ui::CompositorTestSupport::Terminate();
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewTestSuite);
 };
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 16af3ef..07a9d66 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -613,7 +613,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_test_support',
@@ -930,7 +929,6 @@
         ['use_aura==1', {
           'dependencies': [
             '../compositor/compositor.gyp:compositor',
-            '../compositor/compositor.gyp:compositor_test_support',
           ],
         }],
         ['OS=="win"', {