mac: Clean up a few more uses of USE_SKIA

webkit/glue/webkit_glue.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 "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <mlang.h>
 #include <objidl.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 249 matching lines @@
     DumpLeakedObject(__FILE__, __LINE__, "WebFrame", count);
 #endif
 }
 
 bool DecodeImage(const std::string& image_data, SkBitmap* image) {
   WebData web_data(image_data.data(), image_data.length());
   WebImage web_image(WebImage::fromData(web_data, WebSize()));
   if (web_image.isNull())
     return false;
 
-#if defined(OS_MACOSX) && !defined(USE_SKIA)
-  *image = gfx::CGImageToSkBitmap(web_image.getCGImageRef());
-#else
   *image = web_image.getSkBitmap();
-#endif
   return true;
 }
 
 void PlatformFileInfoToWebFileInfo(
     const base::PlatformFileInfo& file_info,
     WebKit::WebFileInfo* web_file_info) {
   DCHECK(web_file_info);
   // WebKit now expects NaN as uninitialized/null Date.
   if (file_info.last_modified.is_null())
     web_file_info->modificationTime = std::numeric_limits<double>::quiet_NaN();
@@ skipping 85 matching lines @@
           base::GetCurrentProcessHandle()));
   return process_metrics->GetPagefileUsage() >> 10;
 }
 #endif
 
 double ZoomFactorToZoomLevel(double factor) {
   return WebView::zoomFactorToZoomLevel(factor);
 }
 
 } // namespace webkit_glue