fix base_unittets bustage observed on mac/linux

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1516 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Aug 29, 2008 · 7a8475c · 7a8475c
1 parent f9624dc
commit 7a8475c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/base/timer.h b/base/timer.h
@@ -326,9 +326,11 @@ class BaseTimer : public BaseTimer_Helper {
       if (!timer_)  // timer_ is null if we were orphaned.
         return;
       BaseTimer<Receiver>* self = static_cast<BaseTimer<Receiver>*>(timer_);
-      self->delayed_task_ = NULL;
-      if (self->repeating_)
+      if (self->repeating_) {
         self->Reset();
+      } else {
+        self->delayed_task_ = NULL;
+      }
       DispatchToMethod(self->receiver_, self->receiver_method_, Tuple0());
     }
   };