Chromium roll (https://codereview.chromium.org/976353002)

cc/debug/picture_record_benchmark.cc

 // Copyright 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 "cc/debug/picture_record_benchmark.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/values.h"
@@ skipping 39 matching lines @@
 
     dimensions_.push_back(std::make_pair(width, height));
   }
 }
 
 PictureRecordBenchmark::~PictureRecordBenchmark() {}
 
 void PictureRecordBenchmark::DidUpdateLayers(LayerTreeHost* host) {
   LayerTreeHostCommon::CallFunctionForSubtree(
       host->root_layer(),
-      base::Bind(&PictureRecordBenchmark::Run, base::Unretained(this)));
+      [this](Layer* layer) { layer->RunMicroBenchmark(this); });
 
   scoped_ptr<base::ListValue> results(new base::ListValue());
   for (std::map<std::pair<int, int>, TotalTime>::iterator it = times_.begin();
        it != times_.end();
        ++it) {
     std::pair<int, int> dimensions = it->first;
     base::TimeDelta total_time = it->second.first;
     unsigned total_count = it->second.second;
 
     double average_time = 0.0;
     if (total_count > 0)
       average_time = total_time.InMillisecondsF() / total_count;
 
     scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
     result->SetInteger("width", dimensions.first);
     result->SetInteger("height", dimensions.second);
     result->SetInteger("samples_count", total_count);
     result->SetDouble("time_ms", average_time);
 
     results->Append(result.release());
   }
 
   NotifyDone(results.Pass());
 }
 
-void PictureRecordBenchmark::Run(Layer* layer) {
-  layer->RunMicroBenchmark(this);
-}
-
 void PictureRecordBenchmark::RunOnLayer(PictureLayer* layer) {
   ContentLayerClient* painter = layer->client();
   gfx::Size content_bounds = layer->content_bounds();
 
   gfx::Size tile_grid_size(kTileGridSize, kTileGridSize);
 
   for (size_t i = 0; i < dimensions_.size(); ++i) {
     std::pair<int, int> dimensions = dimensions_[i];
     int width = dimensions.first;
     int height = dimensions.second;
@@ skipping 14 matching lines @@
         base::TimeDelta duration = end - start;
         TotalTime& total_time = times_[dimensions];
         total_time.first += duration;
         total_time.second++;
       }
     }
   }
 }
 
 }  // namespace cc