Remove IOSurfaceSupport

chrome/test/gpu/gpu_feature_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_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_test_config.h"
 #include "net/base/filename_util.h"
 #include "ui/gl/gl_implementation.h"
 
-#if defined(OS_MACOSX)
-#include "ui/gl/io_surface_support_mac.h"
-#endif
-
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using content::GpuDataManager;
 using gpu::GpuFeatureType;
 using trace_analyzer::Query;
 using trace_analyzer::TraceAnalyzer;
 using trace_analyzer::TraceEventVector;
 
@@ skipping 68 matching lines @@
 
   // Open the URL and check the trace stream for the given event.
   void RunEventTest(const base::FilePath& url,
                     const char* event_name = NULL,
                     bool event_expected = false) {
 #if defined(OS_LINUX) && !defined(NDEBUG)
     // Bypass tests on GPU Linux Debug bots.
     if (gfx::GetGLImplementation() != gfx::kGLImplementationOSMesaGL)
       return;
 #endif
-#if defined(OS_MACOSX)
-    // Bypass tests on Mac OSX 10.5 bots (IOSurfaceSupport is now required).
-    if (!IOSurfaceSupport::Initialize())
-      return;
-#endif
 
     ASSERT_TRUE(tracing::BeginTracing(category_patterns_));
 
     // Have to use a new tab for the blacklist to work.
     RunTest(url, NULL, true);
 
     ASSERT_TRUE(tracing::EndTracing(&trace_events_json_));
 
     analyzer_.reset(TraceAnalyzer::Create(trace_events_json_));
     analyzer_->AssociateBeginEndEvents();
@@ skipping 288 matching lines @@
   EXPECT_GT(stats.mean_us, 15000.0);
 
   // Print out the trace events upon error to debug failures.
   if (stats.mean_us <= 15000.0) {
     fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str());
   }
 }
 
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, IOSurfaceReuse) {
-  if (!IOSurfaceSupport::Initialize())
-    return;
-
   if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot())
     return;
 
   const base::FilePath url(
       FILE_PATH_LITERAL("feature_compositing_static.html"));
   base::FilePath test_path = gpu_test_dir_.Append(url);
   ASSERT_TRUE(base::PathExists(test_path))
       << "Missing test file: " << test_path.value();
 
   ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_path));
@@ skipping 56 matching lines @@
               "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
               "Expected %d", offset_i, offsets[offset_i],
               old_width, new_width, num_creates, expected_creates);
     }
   }
   LOG(INFO) << "finished test";
 }
 #endif
 
 }  // namespace