Unix ifdefs patch for ui/ and webkit/

ui/gfx/image_unittest_util.h

 // 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.
 
 #ifndef UI_GFX_IMAGE_UNITTEST_UTIL_H_
 #define UI_GFX_IMAGE_UNITTEST_UTIL_H_
 
 #include "ui/gfx/image.h"
 
 namespace gfx {
 namespace test {
 
 #if defined(OS_MACOSX)
 typedef NSImage* PlatformImage;
-#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
+#elif defined(TOOLKIT_GTK)

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

TOOLKIT_USES_GTK?

 typedef GdkPixbuf* PlatformImage;
 #else
 typedef const SkBitmap* PlatformImage;
 #endif
 
 SkBitmap* CreateBitmap(int width, int height);
 
 PlatformImage CreatePlatformImage();
 
 gfx::Image::RepresentationType GetPlatformRepresentationType();
 
 }  // namespace test
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_UNITTEST_UTIL_H_