cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation

This change switches all of the remaining RenderingStats collection in
composited mode to use RenderinStatsInstrumentation.

BUG=181319


Review URL: https://chromiumcodereview.appspot.com/12426024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190817 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
index a274100..84c5348 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -73,7 +73,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
 
   // No bitmap set should not trigger any uploads.
   test_layer->SetTexturePriorities(calculator);
-  test_layer->Update(&queue, &occlusion_tracker, NULL);
+  test_layer->Update(&queue, &occlusion_tracker);
   EXPECT_EQ(queue.FullUploadSize(), 0);
   EXPECT_EQ(queue.PartialUploadSize(), 0);
 
@@ -83,7 +83,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
   bitmap.allocPixels();
   test_layer->SetBitmap(bitmap, gfx::Rect(5, 5, 1, 1));
   test_layer->SetTexturePriorities(calculator);
-  test_layer->Update(&queue, &occlusion_tracker, NULL);
+  test_layer->Update(&queue, &occlusion_tracker);
   EXPECT_EQ(queue.FullUploadSize(), 1);
   EXPECT_EQ(queue.PartialUploadSize(), 0);
   ResourceUpdate params = queue.TakeFirstFullUpload();
@@ -107,7 +107,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
 
   // Nothing changed, so no repeated upload.
   test_layer->SetTexturePriorities(calculator);
-  test_layer->Update(&queue, &occlusion_tracker, NULL);
+  test_layer->Update(&queue, &occlusion_tracker);
   EXPECT_EQ(queue.FullUploadSize(), 0);
   EXPECT_EQ(queue.PartialUploadSize(), 0);
   {
@@ -119,7 +119,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
 
   // Reupload after eviction
   test_layer->SetTexturePriorities(calculator);
-  test_layer->Update(&queue, &occlusion_tracker, NULL);
+  test_layer->Update(&queue, &occlusion_tracker);
   EXPECT_EQ(queue.FullUploadSize(), 1);
   EXPECT_EQ(queue.PartialUploadSize(), 0);
 
@@ -129,7 +129,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
   EXPECT_EQ(NULL, params.texture->resource_manager());
   test_layer->SetTexturePriorities(calculator);
   ResourceUpdateQueue queue2;
-  test_layer->Update(&queue2, &occlusion_tracker, NULL);
+  test_layer->Update(&queue2, &occlusion_tracker);
   EXPECT_EQ(queue2.FullUploadSize(), 1);
   EXPECT_EQ(queue2.PartialUploadSize(), 0);
   params = queue2.TakeFirstFullUpload();