promote SkImage::AlphaType to SkAlphaType

BUG=
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/24130009

git-svn-id: http://skia.googlecode.com/svn/trunk@11421 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 7593ba8..e8075bd 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -696,7 +696,7 @@
         10,  // width
         10,  // height
         SkImage::kPMColor_ColorType,
-        SkImage::kPremul_AlphaType
+        kPremul_SkAlphaType
     };
     SkSurface* surface;
     bool useGpu = NULL != factory;
@@ -763,7 +763,7 @@
         10,  // width
         10,  // height
         SkImage::kPMColor_ColorType,
-        SkImage::kPremul_AlphaType
+        kPremul_SkAlphaType
     };
     SkSurface* surface;
     SkSurface* alternateSurface;