Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/logging_work_scheduler.cc

Index: chrome/browser/policy/logging_work_scheduler.cc
diff --git a/chrome/browser/policy/logging_work_scheduler.cc b/chrome/browser/policy/logging_work_scheduler.cc
index 8585ac041010011f85f61f05b8f5c697014081b7..d3ff310d0921263b850f86debfc4319ffa15a232 100644
--- a/chrome/browser/policy/logging_work_scheduler.cc
+++ b/chrome/browser/policy/logging_work_scheduler.cc
@@ -142,8 +142,9 @@ void LoggingWorkScheduler::PostDelayedWork(
 }
 
 void LoggingWorkScheduler::CancelDelayedWork() {
-  DCHECK(callback_.get());
-  callback_->Reset();
+  if (!callback_.get()) return;
+  callback_->Reset();  // erase the callback to the delayed work
+  callback_.reset(NULL);  // erase the pointer to the callback

[gfeher, 2011/07/06 09:47:48]

This file is support code for cloud_policy_subsystem_unittest.cc. These changes
are necessary, because canceling tasks were broken in tests, but this breakage
was only uncovered by the rest of this CL.

[Joao da Silva, 2011/07/06 16:45:14]

Nit: comments text: start with capitals, end with a dot.

[gfeher, 2011/07/07 13:51:00]

Done.

 }
 
 }  // namespace policy