cc: Increased robustness of rasterize and record benchmark.

- 'protected' relevent trace events from changes, by putting argument strings
  as constants into separate file.
- fixed a bug in the collection of raster times, that would output wrong 
  statistics for layers with multiple pictures in a pile.
- Added command line parameters to set number of raster and record repeats,
  wait time before starting the benchmark, and wait time before taking the
  measurements. 
- Reduced the default number of raster and record repeats from 100 to 20. 
  This increases variance, but improves overall robustness (e.g. avoiding
  event buffer overflows)
- Added command line option to print statistics after every page run.

R=nduca@chromium.org,tengs@chromium.org
BUG=226489

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

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

1 files changed, 6 insertions, 12 deletions

diff --git a/cc/resources/picture_pile_unittest.cc b/cc/resources/picture_pile_unittest.cc
index 0ed19f9..1eeb5ad 100644
--- a/cc/resources/picture_pile_unittest.cc
+++ b/cc/resources/picture_pile_unittest.cc
@@ -46,8 +46,7 @@ TEST(PicturePileTest, SmallInvalidateInflated) {
                false,
                gfx::Rect(layer_size),
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   // Invalidate something inside a tile.
   gfx::Rect invalidate_rect(50, 50, 1, 1);
@@ -56,8 +55,7 @@ TEST(PicturePileTest, SmallInvalidateInflated) {
                false,
                invalidate_rect,
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   EXPECT_EQ(1, pile->tiling().num_tiles_x());
   EXPECT_EQ(1, pile->tiling().num_tiles_y());
@@ -100,8 +98,7 @@ TEST(PicturePileTest, LargeInvalidateInflated) {
                false,
                gfx::Rect(layer_size),
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   // Invalidate something inside a tile.
   gfx::Rect invalidate_rect(50, 50, 100, 100);
@@ -110,8 +107,7 @@ TEST(PicturePileTest, LargeInvalidateInflated) {
                false,
                invalidate_rect,
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   EXPECT_EQ(1, pile->tiling().num_tiles_x());
   EXPECT_EQ(1, pile->tiling().num_tiles_y());
@@ -165,8 +161,7 @@ TEST(PicturePileTest, InvalidateOnTileBoundaryInflated) {
                false,
                gfx::Rect(layer_size),
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   // Invalidate something just over a tile boundary by a single pixel.
   // This will invalidate the tile (1, 1), as well as 1 row of pixels in (1, 0).
@@ -180,8 +175,7 @@ TEST(PicturePileTest, InvalidateOnTileBoundaryInflated) {
                false,
                invalidate_rect,
                gfx::Rect(layer_size),
-               &stats_instrumentation,
-               0);
+               &stats_instrumentation);
 
   for (int i = 0; i < pile->tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile->tiling().num_tiles_y(); ++j) {