diff options
| author | pauljensen <pauljensen@chromium.org> | 2015-07-24 11:48:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-24 18:48:28 +0000 |
| commit | c3c0342726b2419107ef044a7577d62c0afadf9c (patch) | |
| tree | 7abde96c7180f8cb8214128fc1424927e1a3fb27 /components/cronet | |
| parent | 5320a2f0f257ce04be9d558ab41562388f920e55 (diff) | |
| download | chromium_src-c3c0342726b2419107ef044a7577d62c0afadf9c.zip chromium_src-c3c0342726b2419107ef044a7577d62c0afadf9c.tar.gz chromium_src-c3c0342726b2419107ef044a7577d62c0afadf9c.tar.bz2 | |
Get Cronet perf test running again
Undo a change from crrev.com/f552e26. Cronet perf test must
override TimelineBasedMeasurement's Measure function as it's
not really a timeline-based-measurement (TBM). It's only a
TBM because SharedAndroidState requires it.
Review URL: https://codereview.chromium.org/1239303002
Cr-Commit-Position: refs/heads/master@{#340297}
Diffstat (limited to 'components/cronet')
| -rwxr-xr-x | components/cronet/android/test/javaperftests/run.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/cronet/android/test/javaperftests/run.py b/components/cronet/android/test/javaperftests/run.py index facffba..111a907b 100755 --- a/components/cronet/android/test/javaperftests/run.py +++ b/components/cronet/android/test/javaperftests/run.py @@ -174,7 +174,7 @@ class CronetPerfTestMeasurement( # it is not a browser with a timeline interface. pass - def MeasureForPageTest(self, tracing_controller, results): + def Measure(self, tracing_controller, results): # Reads results from |RESULTS_FILE| on target and adds to |results|. jsonResults = json.loads(self._device.ReadFile(RESULTS_FILE)) for test in jsonResults: |