Revert of Fixing inbox test by adding sha1 files and enabling inbox benchmark again.

tools/perf/benchmarks/inbox_benchmark.py

Index: tools/perf/benchmarks/inbox_benchmark.py
diff --git a/tools/perf/benchmarks/inbox_benchmark.py b/tools/perf/benchmarks/inbox_benchmark.py
index 33565b6d3f46609cc747d208113ea5dc31fbeb86..a79e87f2b1198a764a5205b27c3861d25c52305f 100644
--- a/tools/perf/benchmarks/inbox_benchmark.py
+++ b/tools/perf/benchmarks/inbox_benchmark.py
@@ -2,14 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from page_sets import inbox
-from telemetry import benchmark
-from telemetry.web_perf import timeline_based_measurement
-
-@benchmark.Disabled('android')
-class Inbox(benchmark.Benchmark):
-  """Runs the timeline based measurement against inbox pageset."""
-  test = timeline_based_measurement.TimelineBasedMeasurement
-
-  def CreatePageSet(self, options):
-    return inbox.InboxPageSet()
+# TODO: Benchmark is failing; see crbug.com/452257. Comment out instead of
+# disabling because the failure happens before the Disabled check.
+#from page_sets import inbox
+#from telemetry import benchmark
+#from telemetry.web_perf import timeline_based_measurement
+#
+#@benchmark.Disabled('android')
+#class Inbox(benchmark.Benchmark):
+#  """Runs the timeline based measurement against inbox pageset."""
+#  test = timeline_based_measurement.TimelineBasedMeasurement
+#
+#  def CreatePageSet(self, options):
+#    return inbox.InboxPageSet()