[ew] Simplify the entry watcher logic.

content/public/test/test_file_system_backend.cc

 // Copyright 2013 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 "content/public/test/test_file_system_backend.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
 #include "storage/browser/fileapi/file_observers.h"
 #include "storage/browser/fileapi/file_system_operation.h"
 #include "storage/browser/fileapi/file_system_operation_context.h"
 #include "storage/browser/fileapi/file_system_quota_util.h"
 #include "storage/browser/fileapi/local_file_util.h"
 #include "storage/browser/fileapi/native_file_util.h"
 #include "storage/browser/fileapi/quota/quota_reservation.h"
 #include "storage/browser/fileapi/sandbox_file_stream_writer.h"
-#include "storage/browser/fileapi/watcher_manager.h"
 #include "storage/browser/quota/quota_manager.h"
 #include "storage/common/fileapi/file_system_util.h"
 
 using storage::FileSystemContext;
 using storage::FileSystemOperation;
 using storage::FileSystemOperationContext;
 using storage::FileSystemURL;
 
 namespace content {
 
@@ skipping 11 matching lines @@
                                      const FileSystemURL& file_system_url,
                                      base::FilePath* local_file_path) override {
     *local_file_path = base_path_.Append(file_system_url.path());
     return base::File::FILE_OK;
   }
 
  private:
   base::FilePath base_path_;
 };
 
-// Stub implementation of storage::WatcherManager. Emits a fake notification
-// after a directory watcher is set successfully.
-class TestWatcherManager : public storage::WatcherManager {
- public:
-  TestWatcherManager() : weak_ptr_factory_(this) {}
-  ~TestWatcherManager() override {}
-
-  // storage::WatcherManager overrides.
-  void AddObserver(Observer* observer) override {
-    observers_.AddObserver(observer);
-  }
-
-  void RemoveObserver(Observer* observer) override {
-    observers_.RemoveObserver(observer);
-  }
-
-  bool HasObserver(Observer* observer) const override {
-    return observers_.HasObserver(observer);
-  }
-
-  void WatchDirectory(const storage::FileSystemURL& url,
-                      bool recursive,
-                      const StatusCallback& callback) override {
-    if (recursive) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE,
-          base::Bind(callback, base::File::FILE_ERROR_INVALID_OPERATION));
-      return;
-    }
-
-    const GURL gurl = url.ToGURL();
-    if (watched_urls_.find(gurl) != watched_urls_.end()) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_EXISTS));
-      return;
-    }
-
-    watched_urls_.insert(gurl);
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, base::File::FILE_OK));
-
-    // Send a fake changed notification.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&TestWatcherManager::SendFakeChangeNotification,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   url));
-
-    // Send a fake removed notification.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&TestWatcherManager::SendFakeRemoveNotification,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   url));
-  }
-
-  void UnwatchEntry(const storage::FileSystemURL& url,
-                    const StatusCallback& callback) override {
-    const GURL gurl = url.ToGURL();
-    if (watched_urls_.find(gurl) == watched_urls_.end()) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_NOT_FOUND));
-      return;
-    }
-
-    watched_urls_.erase(gurl);
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, base::File::FILE_OK));
-  }
-
- private:
-  // Sends a fake notification to each observer about a changed entry
-  // represented by |url|, as long as it is still being watched.
-  void SendFakeChangeNotification(const storage::FileSystemURL& url) {
-    if (watched_urls_.find(url.ToGURL()) == watched_urls_.end())
-      return;
-
-    FOR_EACH_OBSERVER(Observer, observers_, OnEntryChanged(url));
-  }
-
-  // Sends a fake notification to each observer about a removed entry
-  // represented by |url|, as long as it is still being watched.
-  void SendFakeRemoveNotification(const storage::FileSystemURL& url) {
-    if (watched_urls_.find(url.ToGURL()) == watched_urls_.end())
-      return;
-
-    FOR_EACH_OBSERVER(Observer, observers_, OnEntryRemoved(url));
-  }
-
-  ObserverList<Observer> observers_;
-  std::set<GURL> watched_urls_;
-
-  base::WeakPtrFactory<TestWatcherManager> weak_ptr_factory_;
-};
-
 }  // namespace
 
 // This only supports single origin.
 class TestFileSystemBackend::QuotaUtil : public storage::FileSystemQuotaUtil,
                                          public storage::FileUpdateObserver {
  public:
   QuotaUtil() : usage_(0) {}
   ~QuotaUtil() override {}
 
   // FileSystemQuotaUtil overrides.
@@ skipping 43 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(QuotaUtil);
 };
 
 TestFileSystemBackend::TestFileSystemBackend(
     base::SequencedTaskRunner* task_runner,
     const base::FilePath& base_path)
     : base_path_(base_path),
       task_runner_(task_runner),
       file_util_(
           new storage::AsyncFileUtilAdapter(new TestFileUtil(base_path))),
-      watcher_manager_(new TestWatcherManager()),
       quota_util_(new QuotaUtil),
       require_copy_or_move_validator_(false) {
   update_observers_ =
       update_observers_.AddObserver(quota_util_.get(), task_runner_.get());
 }
 
 TestFileSystemBackend::~TestFileSystemBackend() {
 }
 
 bool TestFileSystemBackend::CanHandleType(storage::FileSystemType type) const {
@@ skipping 11 matching lines @@
                base::File::FILE_OK);
 }
 
 storage::AsyncFileUtil* TestFileSystemBackend::GetAsyncFileUtil(
     storage::FileSystemType type) {
   return file_util_.get();
 }
 
 storage::WatcherManager* TestFileSystemBackend::GetWatcherManager(
     storage::FileSystemType type) {
-  return watcher_manager_.get();
+  return NULL;

[sky, 2014/10/23 17:03:20]

nullptr

 }
 
 storage::CopyOrMoveFileValidatorFactory*
 TestFileSystemBackend::GetCopyOrMoveFileValidatorFactory(
     storage::FileSystemType type,
     base::File::Error* error_code) {
   DCHECK(error_code);
   *error_code = base::File::FILE_OK;
   if (require_copy_or_move_validator_) {
     if (!copy_or_move_file_validator_factory_)
@@ skipping 71 matching lines @@
   return NULL;
 }
 
 void TestFileSystemBackend::AddFileChangeObserver(
     storage::FileChangeObserver* observer) {
   change_observers_ =
       change_observers_.AddObserver(observer, task_runner_.get());
 }
 
 }  // namespace content