Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Unified Diff: media/base/wall_clock_time_source.h

Issue 670623002: Change base::TickClock to a ref counted class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio_redesign
Patch Set: y Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/api/cast_channel/logger.cc ('k') | media/base/wall_clock_time_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/wall_clock_time_source.h
diff --git a/media/base/wall_clock_time_source.h b/media/base/wall_clock_time_source.h
index 52159077c6a9ce3119eed7c830dbf6f5a7258323..e48610be6b99ebe5731482ab19c8742356992708 100644
--- a/media/base/wall_clock_time_source.h
+++ b/media/base/wall_clock_time_source.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_
#define MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "media/base/media_export.h"
#include "media/base/time_source.h"
@@ -30,12 +30,12 @@ class MEDIA_EXPORT WallClockTimeSource : public TimeSource {
virtual base::TimeDelta CurrentMediaTime() override;
virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() override;
- void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock);
+ void SetTickClockForTesting(const scoped_refptr<base::TickClock>& tick_clock);
private:
base::TimeDelta CurrentMediaTime_Locked();
- scoped_ptr<base::TickClock> tick_clock_;
+ scoped_refptr<base::TickClock> tick_clock_;
bool ticking_;
// While ticking we can interpolate the current media time by measuring the
« no previous file with comments | « extensions/browser/api/cast_channel/logger.cc ('k') | media/base/wall_clock_time_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698