Remove old (pre-webkit) compositor

BUG=103948
TEST=builds, tests pass

Review URL: http://codereview.chromium.org/9288053

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

9 files changed, 10 insertions, 69 deletions

diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index f186ca0..5ea312d 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -12,28 +12,19 @@
 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h"
 #include "chrome/browser/ui/views/aura/screenshot_taker.h"
 #include "ui/aura/root_window.h"
+#include "ui/gfx/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
-
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
     : ChromeBrowserMainExtraParts() {
 }
 
 void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestCompositor)) {
-#if defined(USE_WEBKIT_COMPOSITOR)
     ui::SetupTestCompositor();
-#else
-    ui::gfx_test_utils::SetupTestCompositor();
-#endif
   }
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index ee54d05..0e41994 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.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.
 
@@ -12,9 +12,7 @@
 #include "content/public/common/show_desktop_notification_params.h"
 
 #if defined(USE_AURA)
-#if defined(USE_WEBKIT_COMPOSITOR)
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#endif
 #include "ui/aura/root_window.h"
 #endif
 
@@ -92,9 +90,7 @@ DesktopNotificationsTest::~DesktopNotificationsTest() {
 
 void DesktopNotificationsTest::SetUp() {
 #if defined(USE_AURA)
-#if defined(USE_WEBKIT_COMPOSITOR)
   WebKit::initialize(&webkit_platform_support_);
-#endif
   // MockBalloonCollection retrieves information about the screen on creation.
   // So it is necessary to make sure the desktop gets created first.
   aura::RootWindow::GetInstance();
@@ -115,10 +111,8 @@ void DesktopNotificationsTest::TearDown() {
   profile_.reset(NULL);
 #if defined(USE_AURA)
   aura::RootWindow::DeleteInstance();
-#if defined(USE_WEBKIT_COMPOSITOR)
   WebKit::shutdown();
 #endif
-#endif
 }
 
 content::ShowDesktopNotificationHostMsgParams
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h
index 2a99a9d..dd6444e 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/notifications/desktop_notifications_unittest.h
@@ -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.
 
@@ -17,13 +17,10 @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/test/render_view_test.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_AURA) && defined(USE_WEBKIT_COMPOSITOR)
-#include "content/test/render_view_test.h"
-#endif
-
 class DesktopNotificationsTest;
 typedef LoggingNotificationDelegate<DesktopNotificationsTest>
     LoggingNotificationProxy;
@@ -117,7 +114,7 @@ class DesktopNotificationsTest : public testing::Test {
   // Real DesktopNotificationService
   scoped_ptr<DesktopNotificationService> service_;
 
-#if defined(USE_AURA) && defined(USE_WEBKIT_COMPOSITOR)
+#if defined(USE_AURA)
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
       webkit_platform_support_;
 #endif
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 8306655..1c8a923 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -35,18 +35,15 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/test/notification_observer_mock.h"
+#include "content/test/render_view_test.h"
 #include "content/test/test_browser_thread.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
-#include "third_party/cld/languages/public/languages.h"
-
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "content/test/render_view_test.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#endif
+#include "third_party/cld/languages/public/languages.h"
 
 using content::BrowserThread;
 using content::NavigationController;
@@ -164,9 +161,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
 
  protected:
   virtual void SetUp() {
-#if defined(USE_WEBKIT_COMPOSITOR)
     WebKit::initialize(&webkit_platform_support_);
-#endif
     // Access the TranslateManager singleton so it is created before we call
     // TabContentsWrapperTestHarness::SetUp() to match what's done in Chrome,
     // where the TranslateManager is created before the TabContents.  This
@@ -196,9 +191,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
             contents_wrapper()->infobar_tab_helper()));
 
     TabContentsWrapperTestHarness::TearDown();
-#if defined(USE_WEBKIT_COMPOSITOR)
     WebKit::shutdown();
-#endif
   }
 
   void SimulateTranslateScriptURLFetch(bool success) {
@@ -256,10 +249,8 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
   content::NotificationRegistrar notification_registrar_;
   TestURLFetcherFactory url_fetcher_factory_;
   content::TestBrowserThread ui_thread_;
-#if defined(USE_WEBKIT_COMPOSITOR)
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
       webkit_platform_support_;
-#endif
 
   // The infobars that have been removed.
   // WARNING: the pointers point to deleted objects, use only for comparison.
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index bfc1c73..4d35715 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -16,14 +16,10 @@
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
-            ['use_webkit_compositor==1 and views_compositor==1', {
+            ['views_compositor==1', {
               'dependencies': [
                 '../ui/gfx/compositor/compositor.gyp:compositor',
               ],
-            }, { # use_webkit_compositor!=1
-              'dependencies': [
-                '../ui/gfx/compositor/compositor.gyp:test_compositor',
-              ],
             }],
             ['OS=="win"', {
               'product_name': 'chrome',
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 27fdbb7..5d52924 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -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.
 
@@ -50,11 +50,6 @@
             }],
           ]
         }],
-        ['use_aura==1 and use_webkit_compositor==0', {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
         ['OS == "android"', {
           # Don't put the 'chrome' target in 'all' on android
           'suppress_wildcard': 1,
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6f2f491..392303a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -286,11 +286,6 @@
             ['exclude', 'test/base/ui_test_utils_win.cc'],
           ],
         }],
-        ['use_webkit_compositor==0', {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
       ],
     },
     {
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index cb22f64..f8e9553b 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -38,11 +38,7 @@
 #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 {
 
@@ -199,11 +195,7 @@ void ChromeTestSuite::Initialize() {
   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());
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 086a655..b4b98c3 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -25,14 +25,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/test/gfx_test_utils.h"
-
-#if defined(USE_WEBKIT_COMPOSITOR)
 #include "ui/gfx/compositor/compositor_setup.h"
-#elif defined(VIEWS_COMPOSITOR)
-#include "ui/gfx/compositor/compositor.h"
-#endif
+#include "ui/gfx/size.h"
 
 namespace {
 
@@ -105,11 +99,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
           &test_name_, 0, test_status_prefixes[i], "");
     }
 
-#if defined(USE_WEBKIT_COMPOSITOR)
     ui::DisableTestCompositor();
-#elif defined(VIEWS_COMPOSITOR)
-    ui::Compositor::set_compositor_factory_for_testing(NULL);
-#endif
   }
 
   // If the existing ref image was saved from an revision older than the