SkClipOp is an enum class now

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/SkClipOp.h"
 #include "third_party/skia/include/core/SkRRect.h"
 
 namespace cc {
 namespace {
 
 TEST(SkiaProtoConversionsTest, SerializeDeserializeSkClipOp) {
   // explicitly list the clipops, as this list will be reduced overtime
   // as skia constricts the valid ops for clipping
   // https://bugs.chromium.org/p/skia/issues/detail?id=3191
   const SkClipOp ops[] = {
-      kDifference_SkClipOp, kIntersect_SkClipOp,         kUnion_SkClipOp,
-      kXOR_SkClipOp,        kReverseDifference_SkClipOp, kReplace_SkClipOp,
+      SkClipOp::kDifference, SkClipOp::kIntersect,         SkClipOp::kUnion,
+      SkClipOp::kXOR,        SkClipOp::kReverseDifference, SkClipOp::kReplace,
   };
   for (SkClipOp op : ops) {
     EXPECT_EQ(op, SkClipOpFromProto(SkClipOpToProto(op)));
   }
 }
 
 TEST(SkiaProtoConversionsTest, SerializeDeserializeSkXfermodeMode) {
   for (size_t i = 0; i < static_cast<size_t>(SkBlendMode::kLastMode); i++) {
     SkBlendMode mode = static_cast<SkBlendMode>(i);
     EXPECT_EQ(mode, SkXfermodeModeFromProto(SkXfermodeModeToProto(mode)));
@@ skipping 35 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