Revert of Revert of Disable blink_perf.canvas on linux.

Revert of Revert of Disable blink_perf.canvas on linux. (patchset #1 id:1 of https://codereview.chromium.org/1142643002/)

Reason for revert:
Looks like this is still failing consistently :(

http://build.chromium.org/p/chromium.perf/builders/Linux%20Perf%20(4)

Original issue's description:
> Revert of Disable blink_perf.canvas on linux. (patchset #1 id:1 of https://codereview.chromium.org/1129383007/)
> 
> Reason for revert:
> Possible fix has landed, reverting to see if bot goes green.
> 
> Original issue's description:
> > Disable blink_perf.canvas on linux.
> >
> > This has been red going on a week now.
> >
> > BUG=488059
> > CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect
> >
> > Committed: https://crrev.com/2e2d7141b8f141bfb194427afde9fb2bf1ed5486
> > Cr-Commit-Position: refs/heads/master@{#330085}
> 
> TBR=sullivan@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=488059
> 
> Committed: https://crrev.com/c67128f7fb96c1e40bfb46a9ba7a1466a754f357
> Cr-Commit-Position: refs/heads/master@{#330086}

TBR=sullivan@chromium.org,simonhatch@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=488059
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect

[Sami, 2015-05-15 17:45:31]

Created Revert of Revert of Disable blink_perf.canvas on linux.

[commit-bot: I haz the power, 2015-05-15 17:46:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1131853007/1

[Sami, 2015-05-15 17:47:46]

The CQ bit was unchecked by skyostil@chromium.org

[Sami, 2015-05-15 17:48:16]

The CQ bit was checked by skyostil@chromium.org

[commit-bot: I haz the power, 2015-05-15 17:50:16]

Commit queue failed due to new patchset.

[commit-bot: I haz the power, 2015-05-15 17:50:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1131853007/40001

[commit-bot: I haz the power, 2015-05-15 17:53:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-15 17:53:16]

Failed to apply patch for tools/perf/benchmarks/blink_perf.py:
While running git apply --index -3 -p1;
  error: patch failed: tools/perf/benchmarks/blink_perf.py:167
  Falling back to three-way merge...
  Applied patch to 'tools/perf/benchmarks/blink_perf.py' with conflicts.
  U tools/perf/benchmarks/blink_perf.py

Patch:       tools/perf/benchmarks/blink_perf.py
Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py
b/tools/perf/benchmarks/blink_perf.py
index
b82bfd73665d1bb070f97c934b0a1e5428025df6..091b86dad1b1a6900b5ccd09bfd3eac56c91d8e6
100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -167,6 +167,7 @@ class BlinkPerfCSS(benchmark.Benchmark):
     return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
+@benchmark.Disabled('linux')  # crbug.com/488059
 class BlinkPerfCanvas(benchmark.Benchmark):
   tag = 'canvas'
   test = _BlinkPerfMeasurement

[commit-bot: I haz the power, 2015-05-15 17:53:59]

The CQ bit was unchecked by commit-bot@chromium.org

[sullivan, 2015-05-15 20:32:39]

lgtm