Telemetry / Android: further cleanup on surface_stats_collector.

- Use a "Start / Stop" method rather than __enter__ / __exit__
- Make "trace_tag" optional
- Remove printing results.

Note: N-sided patch, further cleanup to remove the constructor param and
the __enter__ / __exit__ methods will be done once this rolls.

BUG=


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

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

1 files changed, 7 insertions, 14 deletions

diff --git a/build/android/pylib/surface_stats_collector.py b/build/android/pylib/surface_stats_collector.py
index 42e0874..ca41355 100644
--- a/build/android/pylib/surface_stats_collector.py
+++ b/build/android/pylib/surface_stats_collector.py
@@ -28,19 +28,20 @@ class SurfaceStatsCollector(object):
       self.value = value
       self.unit = unit
 
-  def __init__(self, adb, trace_tag):
+  def __init__(self, adb, trace_tag=''):
     self._adb = adb
-    self._trace_tag = trace_tag
     self._collector_thread = None
     self._use_legacy_method = False
     self._surface_before = None
     self._get_data_event = None
     self._data_queue = None
     self._stop_event = None
-    self._print_perf_results = True
     self._results = []
 
   def __enter__(self):
+    self.Start()
+
+  def Start(self):
     assert not self._collector_thread
 
     if self._ClearSurfaceFlingerLatencyData():
@@ -54,8 +55,10 @@ class SurfaceStatsCollector(object):
       self._surface_before = self._GetSurfaceStatsLegacy()
 
   def __exit__(self, *args):
+    self.Stop()
+
+  def Stop(self):
     self._StorePerfResults()
-    self._PrintPerfResults()
     if self._collector_thread:
       self._stop_event.set()
       self._collector_thread.join()
@@ -64,16 +67,6 @@ class SurfaceStatsCollector(object):
   def GetResults(self):
     return self._results
 
-  def SuppressPrintingResults(self):
-    self._print_perf_results = False
-
-  def _PrintPerfResults(self):
-    if not self._print_perf_results:
-      return
-    for r in self._results:
-      perf_tests_helper.PrintPerfResult(r.name, r.name + self._trace_tag,
-                                        r.value, r.unit)
-
   def _StorePerfResults(self):
     if self._use_legacy_method:
       surface_after = self._GetSurfaceStatsLegacy()