Unix ifdefs patch for ui/ and webkit/

ui/gfx/image_unittest_util.cc

 // Copyright (c) 2011 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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/image_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace gfx {
 namespace test {
 
 SkBitmap* CreateBitmap(int width, int height) {
   SkBitmap* bitmap = new SkBitmap();
   bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap->allocPixels();
   bitmap->eraseRGB(255, 0, 0);
   return bitmap;
 }
 
 PlatformImage CreatePlatformImage() {
   scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25));
 #if defined(OS_MACOSX)
   NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get()));
   base::mac::NSObjectRetain(image);
   return image;
-#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
+#elif defined(TOOLKIT_GTK)

[Robert Sesek, 2011/05/24 16:24:12]

USES?

   return gfx::GdkPixbufFromSkBitmap(bitmap.get());
 #else
   return bitmap.release();
 #endif
 }
 
 gfx::Image::RepresentationType GetPlatformRepresentationType() {
 #if defined(OS_MACOSX)
   return gfx::Image::kImageRepCocoa;
-#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
+#elif defined(TOOLKIT_GTK)

[Robert Sesek, 2011/05/24 16:24:12]

USES?

   return gfx::Image::kImageRepGdk;
 #else
   return gfx::Image::kImageRepSkia;
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx