telemetry: re-enable smoothness.tough_canvas_cases on Android.

The benchmark should work now that https://codereview.chromium.org/51803002
has landed.

R=dtu@chromium.org
BUG=311582

Review URL: https://codereview.chromium.org/51103014

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

tools/perf/measurements/smoothness.py

@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import sys
-
 from metrics import smoothness
 from metrics import timeline
 from telemetry.page import page_test
@@ -33,13 +31,6 @@ class Smoothness(page_measurement.PageMeasurement):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-    # smoothness.tough_canvas_cases fails on Android.
-    # TODO(ernstm): Re-enable this test when crbug.com/311582 is fixed.
-    if (sys.platform == 'android' and
-        (sys.argv[-1].endswith('tough_canvas_cases'))):
-      print '%s is currently disabled on Android. Skipping test.' % sys.argv[-1]
-      sys.exit(0)
-
   def CanRunForPage(self, page):
     return hasattr(page, 'smoothness')