stop using SkXfermode -- use SkBlendMode instead

cc/proto/skia_conversions_unittest.cc

Index: cc/proto/skia_conversions_unittest.cc
diff --git a/cc/proto/skia_conversions_unittest.cc b/cc/proto/skia_conversions_unittest.cc
index c8e02a7bf0e360aaaefd178fab9dae4b9a7da6d7..d87dd37e87d0b7d22f31885b347f4b36611f424c 100644
--- a/cc/proto/skia_conversions_unittest.cc
+++ b/cc/proto/skia_conversions_unittest.cc
@@ -10,9 +10,9 @@
 #include "cc/proto/skrrect.pb.h"
 #include "cc/proto/skxfermode.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBlendMode.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRegion.h"
-#include "third_party/skia/include/core/SkXfermode.h"
 
 namespace cc {
 namespace {
@@ -25,8 +25,8 @@ TEST(SkiaProtoConversionsTest, SerializeDeserializeSkRegionOp) {
 }
 
 TEST(SkiaProtoConversionsTest, SerializeDeserializeSkXfermodeMode) {
-  for (size_t i = 0; i < SkXfermode::Mode::kLastMode; i++) {
-    SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(i);
+  for (size_t i = 0; i < (size_t)SkBlendMode::kLastMode; i++) {

[f(malita), 2016/11/16 21:10:58]

nit: static_cast

[reed1, 2016/11/16 21:31:17]

Done.

+    SkBlendMode mode = static_cast<SkBlendMode>(i);
     EXPECT_EQ(mode, SkXfermodeModeFromProto(SkXfermodeModeToProto(mode)));
   }
 }