Move FilePathWatcher class from browser/... to common/...

content/common/file_path_watcher/file_path_watcher_win.cc

 // Copyright (c) 2010 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 "chrome/browser/file_path_watcher/file_path_watcher.h"
+#include "content/common/file_path_watcher/file_path_watcher.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/message_loop_proxy.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "base/win/object_watcher.h"
 
 namespace {
 
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
                             public base::win::ObjectWatcher::Delegate {
  public:
   FilePathWatcherImpl() : delegate_(NULL), handle_(INVALID_HANDLE_VALUE) {}
 
-  virtual bool Watch(const FilePath& path, FilePathWatcher::Delegate* delegate);
-  virtual void Cancel();
+  // FilePathWatcher::PlatformDelegate overrides.
+  virtual bool Watch(const FilePath& path,
+                     FilePathWatcher::Delegate* delegate,
+                     scoped_refptr<base::MessageLoopProxy> loop) OVERRIDE;
+  virtual void Cancel() OVERRIDE;
 
   // Callback from MessageLoopForIO.
   virtual void OnObjectSignaled(HANDLE object);
 
  private:
   virtual ~FilePathWatcherImpl();
 
   // Setup a watch handle for directory |dir|. Returns true if no fatal error
   // occurs. |handle| will receive the handle value if |dir| is watchable,
   // otherwise INVALID_HANDLE_VALUE.
@@ skipping 23 matching lines @@
   base::Time last_modified_;
 
   // The time at which we processed the first notification with the
   // |last_modified_| time stamp.
   base::Time first_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
 };
 
 bool FilePathWatcherImpl::Watch(const FilePath& path,
-                                FilePathWatcher::Delegate* delegate) {
+                                FilePathWatcher::Delegate* delegate,
+                                scoped_refptr<base::MessageLoopProxy>) {
   DCHECK(target_.value().empty());  // Can only watch one path.
   delegate_ = delegate;
   target_ = path;
 
   if (!UpdateWatch())
     return false;
 
   watcher_.StartWatching(handle_, this);
 
   return true;
 }
 
 void FilePathWatcherImpl::Cancel() {
-  // Switch to the file thread if necessary so we can stop |watcher_|.
-  if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
-    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+  if (!message_loop().get()) {
+    // Watch was never called, so exit.
+    return;
+  }
+    // Switch to the file thread if necessary so we can stop |watcher_|.

[Mattias Nissler (ping if slow), 2011/03/17 18:14:27]

indentation

+  if (!message_loop()->BelongsToCurrentThread()) {
+    message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &FilePathWatcherImpl::Cancel));
     return;
   }
 
   if (handle_ != INVALID_HANDLE_VALUE)
     DestroyWatch();
 }
 
 void FilePathWatcherImpl::OnObjectSignaled(HANDLE object) {
   DCHECK(object == handle_);
@@ skipping 142 matching lines @@
   watcher_.StopWatching();
   FindCloseChangeNotification(handle_);
   handle_ = INVALID_HANDLE_VALUE;
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }