Remove old (pre-webkit) compositor

chrome/test/gpu/gpu_pixel_browsertest.cc

 // 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #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/compositor/compositor_setup.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
 
 namespace {
 
 // Command line flag for overriding the default location for putting generated
 // test images that do not match references.
 const char kGeneratedDir[] = "generated-dir";
 // Command line flag for overriding the default location for reference images.
 const char kReferenceDir[] = "reference-dir";
 
 // Reads and decodes a PNG image to a bitmap. Returns true on success. The PNG
@@ skipping 52 matching lines @@
     else
       ref_img_dir_ = test_data_dir_.AppendASCII("gpu_reference");
 
     test_name_ = testing::UnitTest::GetInstance()->current_test_info()->name();
     const char* test_status_prefixes[] = {"DISABLED_", "FLAKY_", "FAILS_"};
     for (size_t i = 0; i < arraysize(test_status_prefixes); ++i) {
       ReplaceFirstSubstringAfterOffset(
           &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
   // ref_img_update_revision, refresh the ref image.
   void RunPixelTest(const gfx::Size& tab_container_size,
                     const FilePath& url,
                     int64 ref_img_update_revision) {
     ref_img_revision_no_older_than_ = ref_img_update_revision;
     ObtainLocalRefImageFilePath();
 
@@ skipping 291 matching lines @@
   // If test baseline needs to be updated after a given revision, update the
   // following number. If no revision requirement, then 0.
   const int64 ref_img_revision_update = 118461;
 
   gfx::Size container_size(250, 250);
   FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update);
 }