Remove use of SkBitmap::Config (deprecated) from Source/web/tests/.

Source/web/tests/ImageLayerChromiumTest.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 27 matching lines @@
 class MockGraphicsLayerClient : public GraphicsLayerClient {
   public:
     virtual void notifyAnimationStarted(const GraphicsLayer*, double monotonicTime) OVERRIDE { }
     virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { }
     virtual String debugName(const GraphicsLayer*) OVERRIDE { return String(); }
 };
 
 class TestImage : public Image {
 public:
 
-    static PassRefPtr<TestImage> create(const IntSize& size, SkAlphaType alphaType)
+    static PassRefPtr<TestImage> create(const IntSize& size, bool isOpaque)
     {
-        return adoptRef(new TestImage(size, alphaType));
+        return adoptRef(new TestImage(size, isOpaque));
     }
 
-    explicit TestImage(const IntSize& size, SkAlphaType alphaType)
+    explicit TestImage(const IntSize& size, bool isOpaque)
         : Image(0)
         , m_size(size)
     {
         m_nativeImage = NativeImageSkia::create();
-        m_nativeImage->bitmap().setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height(), 0, alphaType);
-        m_nativeImage->bitmap().allocPixels();
+        m_nativeImage->bitmap().allocN32Pixels(size.width(), size.height(), isOpaque);

[reed1, 2014/03/21 15:18:40]

ASSERT_TRUE() ?

[jbroman, 2014/03/21 15:39:34]

Ditto.

     }
 
     virtual bool isBitmapImage() const OVERRIDE
     {
         return true;
     }
 
     virtual bool currentFrameKnownToBeOpaque() OVERRIDE
     {
         return m_nativeImage->bitmap().isOpaque();
@@ skipping 35 matching lines @@
 
     virtual blink::WebLayer* contentsLayer() const { return GraphicsLayer::contentsLayer(); }
 };
 
 TEST(ImageLayerChromiumTest, opaqueImages)
 {
     MockGraphicsLayerClient client;
     OwnPtr<GraphicsLayerForTesting> graphicsLayer = adoptPtr(new GraphicsLayerForTesting(&client));
     ASSERT_TRUE(graphicsLayer.get());
 
-    RefPtr<Image> opaqueImage = TestImage::create(IntSize(100, 100), kOpaque_SkAlphaType);
+    RefPtr<Image> opaqueImage = TestImage::create(IntSize(100, 100), true /* opaque */);
     ASSERT_TRUE(opaqueImage.get());
-    RefPtr<Image> nonOpaqueImage = TestImage::create(IntSize(100, 100), kPremul_SkAlphaType);
+    RefPtr<Image> nonOpaqueImage = TestImage::create(IntSize(100, 100), false /* opaque */);
     ASSERT_TRUE(nonOpaqueImage.get());
 
     ASSERT_FALSE(graphicsLayer->contentsLayer());
 
     graphicsLayer->setContentsToImage(opaqueImage.get());
     ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque());
 
     graphicsLayer->setContentsToImage(nonOpaqueImage.get());
     ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque());
 }
 
 } // namespace