stop using SkXfermode -- use SkBlendMode instead

cc/proto/skia_conversions_unittest.cc

 // Copyright 2015 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.
 
 #include "cc/proto/skia_conversions.h"
 
 #include <stddef.h>
 
 #include "cc/proto/skregion.pb.h"
 #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 {
 
 TEST(SkiaProtoConversionsTest, SerializeDeserializeSkRegionOp) {
   for (size_t i = 0; i < SkRegion::Op::kLastOp; i++) {
     SkRegion::Op op = static_cast<SkRegion::Op>(i);
     EXPECT_EQ(op, SkRegionOpFromProto(SkRegionOpToProto(op)));
   }
 }
 
 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)));
   }
 }
 
 TEST(SkiaProtoConversionsTest, SerializeDeserializeSkRRect) {
   SkRect rect = SkRect::MakeXYWH(0, 10, 15, 20);
   SkVector radii[4];
   radii[0] = SkVector::Make(0.1f, 0.2f);
   radii[1] = SkVector::Make(0.3f, 0.4f);
   radii[2] = SkVector::Make(0.5f, 0.6f);
@@ skipping 26 matching lines @@
             proto.radii_lower_left().x());
   EXPECT_EQ(rrect.radii(SkRRect::kLowerLeft_Corner).y(),
             proto.radii_lower_left().y());
 
   // Test ProtoToRRect
   EXPECT_EQ(rrect, ProtoToSkRRect(proto));
 }
 
 }  // namespace
 }  // namespace cc