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

Unified Diff: chrome/browser/extensions/extension_system.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
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index d1031f271f1e1832361d1a340cae43d1bb9b9a31..1af19d54634f7c1ac0badec7b1b251508fe99558 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -236,6 +236,10 @@ void ExtensionSystemImpl::Shared::Shutdown() {
extension_service_->Shutdown();
}
+base::Clock* ExtensionSystemImpl::Shared::clock() {
+ return &clock_;
+}
+
StateStore* ExtensionSystemImpl::Shared::state_store() {
return state_store_.get();
}
@@ -326,7 +330,7 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
shared_->info_map();
extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
- alarm_manager_.reset(new AlarmManager(profile_, &base::Time::Now));
+ alarm_manager_.reset(new AlarmManager(profile_, shared_->clock()));
serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>(
BrowserThread::FILE));
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698