cc: Renamed approximate{BytesUsed,OpCount} in paint op buffer.

cc/paint/display_item_list_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 "cc/paint/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 326 matching lines @@
 
   // Make an PaintRecord whose size is known.
   gfx::Rect layer_rect(100, 100);
   PaintRecorder recorder;
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect));
   for (int i = 0; i < kNumCommandsInTestSkPicture; i++)
     canvas->drawRect(SkRect(), blue_flags);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
-  size_t record_size = record->approximateBytesUsed();
+  size_t record_size = record->bytes_used();
   ASSERT_GE(record_size, kNumCommandsInTestSkPicture * sizeof(SkRect));
 
   auto list = make_scoped_refptr(new DisplayItemList);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, record);
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
   EXPECT_GE(memory_usage, record_size);
   EXPECT_LE(memory_usage, 2 * record_size);
 }
 
@@ skipping 439 matching lines @@
     PaintRecorder recorder;
     PaintCanvas* canvas =
         recorder.beginRecording(kVisualRect.width(), kVisualRect.height());
     PaintFlags flags;
     flags.setAlpha(40);
     canvas->drawRect(gfx::RectToSkRect(kVisualRect), flags);
     // Add an extra op here.
     canvas->drawRect(gfx::RectToSkRect(kVisualRect), flags);
     record = recorder.finishRecordingAsPicture();
   }
-  EXPECT_GT(record->approximateOpCount(), 1);
+  EXPECT_GT(record->size(), 1u);
 
   auto list = make_scoped_refptr(new DisplayItemList);
 
   list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
       80, SkBlendMode::kSrcOver, nullptr, nullptr, false);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect,
                                                        std::move(record));
   list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
   list->Finalize();
 
   SaveCountingCanvas canvas;
   list->Raster(&canvas);
 
   EXPECT_EQ(1, canvas.save_count_);
   EXPECT_EQ(1, canvas.restore_count_);
   EXPECT_EQ(gfx::RectToSkRect(kVisualRect), canvas.draw_rect_);
   EXPECT_LE(40, canvas.paint_.getAlpha());
 }
 
 }  // namespace cc