Mirror Windows implementation of CancelOnMessageLoopThread.

base/files/file_path_watcher_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path_watcher.h"
 
 #include <errno.h>
 #include <string.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
@@ skipping 386 matching lines @@
   // Switch to the message_loop_ if necessary so we can access |watches_|.
   if (!message_loop()->BelongsToCurrentThread()) {
     message_loop()->PostTask(FROM_HERE,
                              new FilePathWatcher::CancelTask(this));
   } else {
     CancelOnMessageLoopThread();
   }
 }
 
 void FilePathWatcherImpl::CancelOnMessageLoopThread() {
-  if (!is_cancelled()) {
+  if (!is_cancelled())
     set_cancelled();
+
+  if (delegate_) {
     MessageLoop::current()->RemoveDestructionObserver(this);
+    delegate_ = NULL;
+  }
 
-    for (WatchVector::iterator watch_entry(watches_.begin());
-         watch_entry != watches_.end(); ++watch_entry) {
-      if (watch_entry->watch_ != InotifyReader::kInvalidWatch)
-        g_inotify_reader.Get().RemoveWatch(watch_entry->watch_, this);
-    }
-    watches_.clear();
-    delegate_ = NULL;
-    target_.clear();
+  for (WatchVector::iterator watch_entry(watches_.begin());
+       watch_entry != watches_.end(); ++watch_entry) {
+    if (watch_entry->watch_ != InotifyReader::kInvalidWatch)
+      g_inotify_reader.Get().RemoveWatch(watch_entry->watch_, this);
   }
+  watches_.clear();
+  target_.clear();
 }
 
 void FilePathWatcherImpl::WillDestroyCurrentMessageLoop() {
   CancelOnMessageLoopThread();
 }
 
 bool FilePathWatcherImpl::UpdateWatches() {
   // Ensure this runs on the message_loop_ exclusively in order to avoid
   // concurrency issues.
   DCHECK(message_loop()->BelongsToCurrentThread());
@@ skipping 23 matching lines @@
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }
 
 }  // namespace files
 }  // namespace base