Unix ifdefs patch for ui/ and webkit/

ui/gfx/image_unittest_util.cc

Index: ui/gfx/image_unittest_util.cc
diff --git a/ui/gfx/image_unittest_util.cc b/ui/gfx/image_unittest_util.cc
index bb1265bebd17cbbcd56311f387a529c38e3df5e1..170a5252bd4cbba27871d5efcea46efe4508964d 100644
--- a/ui/gfx/image_unittest_util.cc
+++ b/ui/gfx/image_unittest_util.cc
@@ -10,7 +10,7 @@
 #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"
@@ -34,7 +34,7 @@ PlatformImage CreatePlatformImage() {
   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();
@@ -44,7 +44,7 @@ PlatformImage CreatePlatformImage() {
 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;