use SkClipOps where we can, legacyClip where we need to rework

content/renderer/skia_benchmarking_extension_unittest.cc

 // Copyright (c) 2013 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 "content/renderer/skia_benchmarking_extension.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/src/utils/debugger/SkDebugCanvas.h"
@@ skipping 33 matching lines @@
   // Prepare canvas and resources.
   SkDebugCanvas canvas(100, 100);
   SkPaint red_paint;
   red_paint.setColor(SkColorSetARGB(255, 255, 0, 0));
   SkRect fullRect = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
   SkRect fillRect = SkRect::MakeXYWH(SkIntToScalar(25), SkIntToScalar(25),
                                      SkIntToScalar(50), SkIntToScalar(50));
 
   // Draw a trivial scene.
   canvas.save();
-  canvas.clipRect(fullRect, SkRegion::kIntersect_Op, false);
+  canvas.clipRect(fullRect);
   canvas.translate(SkIntToScalar(10), SkIntToScalar(10));
   canvas.scale(SkIntToScalar(2), SkIntToScalar(2));
   canvas.drawRect(fillRect, red_paint);
   canvas.restore();
 
   // Verify the recorded commands.
   DrawType cmd;
   int idx = 0;
   ASSERT_EQ(canvas.getSize(), 6);
 
@@ skipping 30 matching lines @@
   EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Draw Rect");
   EXPECT_TRUE(HasInfoField(canvas, idx, "SkRect"));
 
   ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
   EXPECT_EQ(cmd, RESTORE);
   EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Restore");
 }
 
 } // namespace content