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

content/browser/compositor/software_output_device_ozone_unittest.cc

 // Copyright 2014 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkDevice.h"
@@ skipping 134 matching lines @@
 
   // Clear the background to black.
   canvas->drawColor(SK_ColorBLACK);
 
   cc::SoftwareFrameData frame;
   output_device_->EndPaint(&frame);
 
   // Draw a white rectangle.
   gfx::Rect damage(area.width() / 2, area.height() / 2);
   canvas = output_device_->BeginPaint(damage);
-  canvas->clipRect(gfx::RectToSkRect(damage), SkRegion::kReplace_Op);
+  canvas->legacyClipRect(gfx::RectToSkRect(damage), SkRegion::kReplace_Op);
 
   canvas->drawColor(SK_ColorWHITE);
 
   output_device_->EndPaint(&frame);
 
   SkPMColor pixels[width * height];
   output_device_->CopyToPixels(area, pixels);
 
   // Check that the copied bitmap contains the same pixel values as what we
   // painted.
   const SkPMColor white = SkPreMultiplyColor(SK_ColorWHITE);
   const SkPMColor black = SkPreMultiplyColor(SK_ColorBLACK);
   for (int i = 0; i < area.height(); ++i) {
     for (int j = 0; j < area.width(); ++j) {
       if (j < damage.width() && i < damage.height())
         EXPECT_EQ(white, pixels[i * area.width() + j]);
       else
         EXPECT_EQ(black, pixels[i * area.width() + j]);
     }
   }
 }