diff options
| author | charliea <charliea@google.com> | 2015-01-26 09:35:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-26 17:36:51 +0000 |
| commit | 3be83970173f29ff3fec067fe64ff9910ce53c73 (patch) | |
| tree | fc4b06ee8ee1f66001eb379412d35d234711bf93 /media/test | |
| parent | 4bf260f81b3909da9099e5bcac948cbc0ca5e295 (diff) | |
| download | chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.zip chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.tar.gz chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.tar.bz2 | |
Replaces instances of the deprecated TimeTicks::HighResNow() with TimeTicks::Now().
BUG=
Review URL: https://codereview.chromium.org/864943002
Cr-Commit-Position: refs/heads/master@{#313084}
Diffstat (limited to 'media/test')
| -rw-r--r-- | media/test/pipeline_integration_perftest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/test/pipeline_integration_perftest.cc b/media/test/pipeline_integration_perftest.cc index 81efc90..e09de39 100644 --- a/media/test/pipeline_integration_perftest.cc +++ b/media/test/pipeline_integration_perftest.cc @@ -24,7 +24,7 @@ static void RunPlaybackBenchmark(const std::string& filename, PIPELINE_OK, pipeline.Start(filename, PipelineIntegrationTestBase::kClockless)); - base::TimeTicks start = base::TimeTicks::HighResNow(); + base::TimeTicks start = base::TimeTicks::Now(); pipeline.Play(); ASSERT_TRUE(pipeline.WaitUntilOnEnded()); @@ -35,7 +35,7 @@ static void RunPlaybackBenchmark(const std::string& filename, if (audio_only) { time_seconds += pipeline.GetAudioTime().InSecondsF(); } else { - time_seconds += (base::TimeTicks::HighResNow() - start).InSecondsF(); + time_seconds += (base::TimeTicks::Now() - start).InSecondsF(); } } |