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

Unified Diff: chrome/browser/extensions/api/alarms/alarms_api.cc

Issue 12314056: Make chrome/browser/extensions use base::Clock instead of MockTimeProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add include Created 7 years, 10 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
Index: chrome/browser/extensions/api/alarms/alarms_api.cc
diff --git a/chrome/browser/extensions/api/alarms/alarms_api.cc b/chrome/browser/extensions/api/alarms/alarms_api.cc
index 56581151326cb7da97b823566a25533df025201a..351d1a1e8831ebaf75e9b0ec3ddc73df3b2c2bc0 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/extensions/api/alarms/alarms_api.h"
#include "base/strings/string_number_conversions.h"
+#include "base/time/clock.h"
+#include "base/time/default_clock.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/alarms/alarm_manager.h"
#include "chrome/browser/extensions/extension_system.h"
@@ -88,7 +90,14 @@ bool ValidateAlarmCreateInfo(const std::string& alarm_name,
} // namespace
AlarmsCreateFunction::AlarmsCreateFunction()
- : now_(&base::Time::Now) {
+ : clock_(new base::DefaultClock()), owns_clock_(true) {}
+
+AlarmsCreateFunction::AlarmsCreateFunction(base::Clock* clock)
+ : clock_(clock), owns_clock_(false) {}
+
+AlarmsCreateFunction::~AlarmsCreateFunction() {
+ if (owns_clock_)
+ delete clock_;
}
bool AlarmsCreateFunction::RunImpl() {
@@ -110,7 +119,7 @@ bool AlarmsCreateFunction::RunImpl() {
base::TimeDelta::FromMinutes(
GetExtension()->location() == Manifest::LOAD ?
kDevDelayMinimum : kReleaseDelayMinimum),
- now_);
+ clock_->Now());
ExtensionSystem::Get(profile())->alarm_manager()->AddAlarm(
extension_id(), alarm);
« no previous file with comments | « chrome/browser/extensions/api/alarms/alarms_api.h ('k') | chrome/browser/extensions/api/alarms/alarms_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698